Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

"int32 * uint32" doesn't give what I wanted (the "previous block" function

Browse Source 
was broken).
"Write" had the wrong shortcut (and I already wondered...).
The PositionSlider now correctly disables itself when it's not needed. Added
some nice disabled drawings for the slider bar.


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@6737 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2004-02-25 00:54:39 +00:00
parent 7d7f16ac72
commit 51f0d53048
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/apps/diskprobe/ProbeView.cpp
View File

@ -275,17 +275,23 @@ PositionSlider::DrawBar()
frame.top++; frame.top++;
frame.left++; frame.left++;
frame.right = ThumbFrame().left + ThumbFrame().Width() / 2; frame.right = ThumbFrame().left + ThumbFrame().Width() / 2;
view->SetHighColor(ui_color(B_CONTROL_HIGHLIGHT_COLOR)); //102, 152, 203); view->SetHighColor(ui_color(B_CONTROL_HIGHLIGHT_COLOR));
// ToDo: the color should probably be retrieved from one of the ui colors
view->FillRect(frame); view->FillRect(frame);
frame.left = frame.right + 1; frame.left = frame.right + 1;
frame.right = barFrame.right - 1; frame.right = barFrame.right - 1;
view->SetHighColor(tint_color(ViewColor(), B_DARKEN_1_TINT)); view->SetHighColor(tint_color(ViewColor(), IsEnabled() ? B_DARKEN_1_TINT : B_LIGHTEN_1_TINT));
view->FillRect(frame); view->FillRect(frame);
rgb_color cornerColor = tint_color(ViewColor(), B_DARKEN_1_TINT); rgb_color cornerColor = tint_color(ViewColor(), B_DARKEN_1_TINT);
rgb_color darkColor = tint_color(ViewColor(), B_DARKEN_3_TINT); rgb_color darkColor = tint_color(ViewColor(), B_DARKEN_3_TINT);
rgb_color shineColor = ui_color(B_SHINE_COLOR);
rgb_color shadowColor =ui_color(B_SHADOW_COLOR);
if (!IsEnabled()) {
darkColor = tint_color(ViewColor(), B_DARKEN_1_TINT);
shineColor = tint_color(shineColor, B_DARKEN_2_TINT);
shadowColor = tint_color(shadowColor, B_LIGHTEN_2_TINT);
}
view->BeginLineArray(9); view->BeginLineArray(9);
@ -298,18 +304,18 @@ PositionSlider::DrawBar()
view->AddLine(BPoint(barFrame.left, barFrame.top + 1), view->AddLine(BPoint(barFrame.left, barFrame.top + 1),
BPoint(barFrame.left, barFrame.bottom - 1), darkColor); BPoint(barFrame.left, barFrame.bottom - 1), darkColor);
view->AddLine(BPoint(barFrame.right, barFrame.top + 1), view->AddLine(BPoint(barFrame.right, barFrame.top + 1),
BPoint(barFrame.right, barFrame.bottom), ui_color(B_SHINE_COLOR)); BPoint(barFrame.right, barFrame.bottom), shineColor);
barFrame.left++; barFrame.left++;
barFrame.right--; barFrame.right--;
view->AddLine(barFrame.LeftTop(), barFrame.RightTop(), darkColor); view->AddLine(barFrame.LeftTop(), barFrame.RightTop(), darkColor);
view->AddLine(barFrame.LeftBottom(), barFrame.RightBottom(), ui_color(B_SHINE_COLOR)); view->AddLine(barFrame.LeftBottom(), barFrame.RightBottom(), shineColor);
// the inner edges // the inner edges
barFrame.top++; barFrame.top++;
view->AddLine(barFrame.LeftTop(), barFrame.RightTop(), ui_color(B_SHADOW_COLOR)); view->AddLine(barFrame.LeftTop(), barFrame.RightTop(), shadowColor);
view->AddLine(BPoint(barFrame.left, barFrame.top + 1), view->AddLine(BPoint(barFrame.left, barFrame.top + 1),
BPoint(barFrame.left, barFrame.bottom - 1), ui_color(B_SHADOW_COLOR)); BPoint(barFrame.left, barFrame.bottom - 1), shadowColor);
view->EndLineArray(); view->EndLineArray();
} }
@ -320,6 +326,7 @@ void
PositionSlider::Reset() PositionSlider::Reset()
{ {
SetKeyIncrementValue(int32(1.0 * kMaxSliderLimit / ((fSize - 1) / fBlockSize) + 0.5)); SetKeyIncrementValue(int32(1.0 * kMaxSliderLimit / ((fSize - 1) / fBlockSize) + 0.5));
SetEnabled(fSize > fBlockSize);
} }
@ -352,8 +359,6 @@ PositionSlider::SetSize(off_t size)
if (size == fSize) if (size == fSize)
return; return;
SetEnabled(fSize > fBlockSize);
off_t position = Position(); off_t position = Position();
if (position >= size) if (position >= size)
position = size - 1; position = size - 1;
@ -675,7 +680,7 @@ HeaderView::MessageReceived(BMessage *message)
if (message->FindInt32("delta", &delta) != B_OK) if (message->FindInt32("delta", &delta) != B_OK)
fPosition = strtoll(fPositionControl->Text(), NULL, 0) * fBlockSize; fPosition = strtoll(fPositionControl->Text(), NULL, 0) * fBlockSize;
else else
fPosition += delta * fBlockSize; fPosition += delta * off_t(fBlockSize);
// update views // update views
UpdatePositionViews(); UpdatePositionViews();
@ -1038,7 +1043,7 @@ ProbeView::AttachedToWindow()
menu->AddItem(new BMenuItem(subMenu)); menu->AddItem(new BMenuItem(subMenu));
menu->AddSeparatorItem(); menu->AddSeparatorItem();
menu->AddItem(new BMenuItem("Write", NULL, 'W', B_COMMAND_KEY)); menu->AddItem(new BMenuItem("Write", NULL, 'S', B_COMMAND_KEY));
menu->AddSeparatorItem(); menu->AddSeparatorItem();
subMenu = new BMenu("Bookmarks"); subMenu = new BMenu("Bookmarks");