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

The slider now has a fixed size, and will be hidden in case the icon could not

Browse Source 
be rendered.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@19198 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2006-11-04 11:23:24 +00:00
parent def587e463
commit e9ba57e495
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/diskprobe/AttributeEditors.cpp
+14 -9
View File
@@ -778,7 +778,7 @@ ImageView::ImageView(BRect rect, DataEditor &editor)
if (editor.Type() == B_RAW_TYPE) {
// vector icon
fScaleSlider = new BSlider(Bounds(), "", NULL,
fScaleSlider = new BSlider(BRect(0, 0, 140, 20), "", NULL,
new BMessage(kMsgScaleChanged), 2, 16);
fScaleSlider->SetModificationMessage(new BMessage(kMsgScaleChanged));
fScaleSlider->ResizeToPreferred();
@@ -1015,21 +1015,26 @@ ImageView::UpdateImage()
BRect bounds = fBitmap->Bounds();
rect.bottom += bounds.Height() + 5;
float x = 0;
if (bounds.Width() > rect.Width()) {
if (fScaleSlider != NULL && rect.Width() < fScaleSlider->Bounds().Width())
rect.right = fScaleSlider->Bounds().right;
if (bounds.Width() > rect.Width())
rect.right = bounds.right;
x = (bounds.Width() - rect.Width()) / 2;
}
// center description below the bitmap
fDescriptionView->MoveTo(x, bounds.Height() + 5);
fDescriptionView->MoveTo((rect.Width() - fDescriptionView->Bounds().Width()) / 2,
bounds.Height() + 5);
if (fScaleSlider != NULL) {
// center slider below description
rect.bottom += fScaleSlider->Bounds().Height() + 5;
fScaleSlider->MoveTo(0, fDescriptionView->Frame().bottom + 5);
fScaleSlider->ResizeTo(rect.Width(), fScaleSlider->Bounds().Height());
fScaleSlider->MoveTo((rect.Width() - fScaleSlider->Bounds().Width()) / 2,
fDescriptionView->Frame().bottom + 5);
if (fScaleSlider->IsHidden())
fScaleSlider->Show();
}
}
} else if (fScaleSlider != NULL && !fScaleSlider->IsHidden())
fScaleSlider->Hide();
ResizeTo(rect.Width(), rect.Height());
if (Parent()) {