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

Although VirtualMemory did respect the font height already, it didn't care

Browse Source 
if the window was wide enough for the strings - it now does.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@13629 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2005-07-11 00:24:14 +00:00
parent 36fa547a10
commit f84e00e27c
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/preferences/virtualmemory/SettingsWindow.cpp
+12 -8
View File
@@ -36,7 +36,7 @@ static const uint32 kMsgSwapEnabledUpdate = 'swen';
class SizeSlider : public BSlider { class SizeSlider : public BSlider {
public: public:
SizeSlider(BRect rect, const char* name, const char* label, SizeSlider(BRect rect, const char* name, const char* label,
BMessage* message, int32 min, int32 max); BMessage* message, int32 min, int32 max, uint32 resizingMode);
virtual ~SizeSlider(); virtual ~SizeSlider();
virtual char* UpdateText() const; virtual char* UpdateText() const;
@@ -78,8 +78,8 @@ byte_string(int64 size)
SizeSlider::SizeSlider(BRect rect, const char* name, const char* label, SizeSlider::SizeSlider(BRect rect, const char* name, const char* label,
BMessage* message, int32 min, int32 max) BMessage* message, int32 min, int32 max, uint32 resizingMode)
: BSlider(rect, name, label, message, min, max) : BSlider(rect, name, label, message, min, max, B_BLOCK_THUMB, resizingMode)
{ {
rgb_color color = ui_color(B_CONTROL_HIGHLIGHT_COLOR); rgb_color color = ui_color(B_CONTROL_HIGHLIGHT_COLOR);
UseFillColor(true, &color); UseFillColor(true, &color);
@@ -107,8 +107,6 @@ SettingsWindow::SettingsWindow()
: BWindow(BRect(0, 0, 269, 172), "VirtualMemory", B_TITLED_WINDOW, : BWindow(BRect(0, 0, 269, 172), "VirtualMemory", B_TITLED_WINDOW,
B_NOT_RESIZABLE | B_ASYNCHRONOUS_CONTROLS | B_NOT_ZOOMABLE) B_NOT_RESIZABLE | B_ASYNCHRONOUS_CONTROLS | B_NOT_ZOOMABLE)
{ {
// fSettings = new Settings();
BRect rect = Bounds(); BRect rect = Bounds();
BView* view = new BView(rect, "background", B_FOLLOW_ALL, B_WILL_DRAW); BView* view = new BView(rect, "background", B_FOLLOW_ALL, B_WILL_DRAW);
view->SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR)); view->SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
@@ -124,7 +122,7 @@ SettingsWindow::SettingsWindow()
fSwapEnabledCheckBox->ResizeToPreferred(); fSwapEnabledCheckBox->ResizeToPreferred();
rect.InsetBy(10, 10); rect.InsetBy(10, 10);
BBox* box = new BBox(rect, "box"); BBox* box = new BBox(rect, "box", B_FOLLOW_LEFT_RIGHT);
box->SetLabel(fSwapEnabledCheckBox); box->SetLabel(fSwapEnabledCheckBox);
view->AddChild(box); view->AddChild(box);
@@ -180,7 +178,8 @@ SettingsWindow::SettingsWindow()
rect.OffsetBy(0, lineHeight + 8); rect.OffsetBy(0, lineHeight + 8);
fSizeSlider = new SizeSlider(rect, "size slider", "Requested Swap File Size:", fSizeSlider = new SizeSlider(rect, "size slider", "Requested Swap File Size:",
new BMessage(kMsgSliderUpdate), minSize / kMegaByte, maxSize / kMegaByte); new BMessage(kMsgSliderUpdate), minSize / kMegaByte, maxSize / kMegaByte,
B_FOLLOW_LEFT_RIGHT);
fSizeSlider->SetLimitLabels("999 MB", "999 MB"); fSizeSlider->SetLimitLabels("999 MB", "999 MB");
fSizeSlider->ResizeToPreferred(); fSizeSlider->ResizeToPreferred();
box->AddChild(fSizeSlider); box->AddChild(fSizeSlider);
@@ -210,7 +209,12 @@ SettingsWindow::SettingsWindow()
ResizeTo(view->Bounds().Width(), view->Bounds().Height()); ResizeTo(view->Bounds().Width(), view->Bounds().Height());
AddChild(view); AddChild(view);
// add view after resizing the window, so that the view's resizing // add view after resizing the window, so that the view's resizing
// mode is not used (we already layed out the views for the new size) // mode is not used (we already layed out the views for the new height)
// if the strings don't fit on screen, we enlarge the window now - the
// views are already added to the window and will resize automatically
if (Bounds().Width() < view->StringWidth(fSizeSlider->Label()) * 2)
ResizeTo(view->StringWidth(fSizeSlider->Label()) * 2, Bounds().Height());
Update(); Update();