i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resize button only for width

Browse Source 
fix bug #766


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@20410 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Jérôme Duval
2007-03-23 19:01:59 +00:00
parent aaea7f1795
commit 99a76eaeeb
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/expander/DirectoryFilePanel.cpp
+8 -6
View File
@@ -60,11 +60,13 @@ DirectoryFilePanel::Show()
rect.top = rect.bottom - 35; rect.top = rect.bottom - 35;
rect.bottom -= 10; rect.bottom -= 10;
} }
rect.right = rect.left -= 30;
float directory_width = be_plain_font->StringWidth("Select current") + 20;
rect.left = (directory_width > 75) ? (rect.right - directory_width) : (rect.right - 75);
fCurrentButton = new BButton(rect, "directoryButton", "Select current", fCurrentButton = new BButton(rect, "directoryButton", "Select current",
new BMessage(MSG_DIRECTORY), B_FOLLOW_RIGHT | B_FOLLOW_BOTTOM); new BMessage(MSG_DIRECTORY), B_FOLLOW_RIGHT | B_FOLLOW_BOTTOM);
fCurrentButton->ResizeToPreferred();
fCurrentButton->MoveBy(-fCurrentButton->Bounds().Width() - 30, 0);
background->AddChild(fCurrentButton); background->AddChild(fCurrentButton);
fCurrentButton->SetTarget(Messenger()); fCurrentButton->SetTarget(Messenger());
@@ -96,14 +98,14 @@ DirectoryFilePanel::SelectionChanged(void)
Window()->GetSizeLimits(&maxWidth, &dummy, &dummy, &dummy); Window()->GetSizeLimits(&maxWidth, &dummy, &dummy, &dummy);
maxWidth -= Window()->Bounds().Width() + 8 - fCurrentButton->Frame().right; maxWidth -= Window()->Bounds().Width() + 8 - fCurrentButton->Frame().right;
float oldWidth = fCurrentButton->Bounds().Width(); BRect oldBounds = fCurrentButton->Bounds();
fCurrentButton->SetLabel(label); fCurrentButton->SetLabel(label);
float width, height; float width, height;
fCurrentButton->GetPreferredSize(&width, &height); fCurrentButton->GetPreferredSize(&width, &height);
if (width > maxWidth) if (width > maxWidth)
width = maxWidth; width = maxWidth;
fCurrentButton->ResizeTo(width, height); fCurrentButton->ResizeTo(width, oldBounds.Height());
fCurrentButton->MoveBy(oldWidth - width, 0); fCurrentButton->MoveBy(oldBounds.Width() - width, 0);
Window()->Unlock(); Window()->Unlock();