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

Improved the placement of the "Stop" button with smaller window sizes.

Browse Source 
It will now also follow the right border of the window.
Enlarged the minimum window width a bit, so that the stop button can no
longer overlay the position text control.


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@6945 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2004-03-10 15:11:25 +00:00
parent 86d5deed7b
commit 7c49aee74f
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/diskprobe/ProbeView.cpp
+10 -7
View File
@@ -442,7 +442,7 @@ HeaderView::HeaderView(BRect frame, const entry_ref *ref, DataEditor &editor)
BRect rect = Bounds(); BRect rect = Bounds();
fStopButton = new BButton(BRect(0, 0, 20, 20), B_EMPTY_STRING, "Stop", fStopButton = new BButton(BRect(0, 0, 20, 20), B_EMPTY_STRING, "Stop",
new BMessage(kMsgStopFind)); new BMessage(kMsgStopFind), B_FOLLOW_TOP | B_FOLLOW_RIGHT);
fStopButton->ResizeToPreferred(); fStopButton->ResizeToPreferred();
fStopButton->MoveTo(rect.right - 5 - fStopButton->Bounds().Width(), 5); fStopButton->MoveTo(rect.right - 5 - fStopButton->Bounds().Width(), 5);
fStopButton->Hide(); fStopButton->Hide();
@@ -468,8 +468,8 @@ HeaderView::HeaderView(BRect frame, const entry_ref *ref, DataEditor &editor)
} }
rect = stringView->Frame(); rect = stringView->Frame();
rect.left = rect.right; rect.left = rect.right;
rect.right = fStopButton->Frame().left - 1; rect.right = fStopButton->Frame().right - 1;
fPathView = new BStringView(rect, B_EMPTY_STRING, string.String()); fPathView = new BStringView(rect, B_EMPTY_STRING, string.String(), B_FOLLOW_TOP | B_FOLLOW_LEFT_RIGHT);
fPathView->SetFont(&plainFont); fPathView->SetFont(&plainFont);
AddChild(fPathView); AddChild(fPathView);
@@ -773,10 +773,13 @@ HeaderView::MessageReceived(BMessage *message)
bool state; bool state;
if (message->FindBool("running", &state) == B_OK && fFileSize > fBlockSize) { if (message->FindBool("running", &state) == B_OK && fFileSize > fBlockSize) {
fPositionSlider->SetEnabled(!state); fPositionSlider->SetEnabled(!state);
if (state) if (state) {
fPathView->ResizeBy(-fStopButton->Bounds().Width(), 0);
fStopButton->Show(); fStopButton->Show();
else } else {
fStopButton->Hide(); fStopButton->Hide();
fPathView->ResizeBy(fStopButton->Bounds().Width(), 0);
}
} }
off_t position; off_t position;
@@ -1096,10 +1099,10 @@ ProbeView::UpdateSizeLimits()
BRect frame = Window()->ConvertFromScreen(ConvertToScreen(fHeaderView->Frame())); BRect frame = Window()->ConvertFromScreen(ConvertToScreen(fHeaderView->Frame()));
Window()->SetSizeLimits(200, width + B_V_SCROLL_BAR_WIDTH, Window()->SetSizeLimits(250, width + B_V_SCROLL_BAR_WIDTH,
200, height + frame.bottom + 4 + B_H_SCROLL_BAR_HEIGHT); 200, height + frame.bottom + 4 + B_H_SCROLL_BAR_HEIGHT);
} else } else
Window()->SetSizeLimits(200, 32768, 200, 32768); Window()->SetSizeLimits(250, 32768, 200, 32768);
#ifdef COMPILE_FOR_R5 #ifdef COMPILE_FOR_R5
BRect bounds = Window()->Bounds(); BRect bounds = Window()->Bounds();