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

Change SCROLL_KNOB_* constants to B_SCROLL_KNOB_*

Browse Source
This commit is contained in:
John Scipione
2012-11-02 19:08:09 -04:00
parent 87e7009019
commit dfa8cf8c05
4 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/os/interface/ScrollBar.h
+4 -3
View File
@@ -20,11 +20,12 @@
enum { enum {
KNOB_STYLE_NONE = 0, B_KNOB_STYLE_NONE = 0,
KNOB_STYLE_DOTS, B_KNOB_STYLE_DOTS,
KNOB_STYLE_LINES B_KNOB_STYLE_LINES
}; };
class BScrollBar : public BView { class BScrollBar : public BView {
public: public:
BScrollBar(BRect frame, const char* name, BScrollBar(BRect frame, const char* name,
src/kits/interface/ScrollBar.cpp
+2 -2
View File
@@ -1154,11 +1154,11 @@ BScrollBar::Draw(BRect updateRect)
} }
} }
if (fPrivateData->fScrollBarInfo.knob == KNOB_STYLE_NONE) if (fPrivateData->fScrollBarInfo.knob == B_KNOB_STYLE_NONE)
return; return;
// draw the scrollbar thumb knobs // draw the scrollbar thumb knobs
bool square = fPrivateData->fScrollBarInfo.knob == KNOB_STYLE_DOTS; bool square = fPrivateData->fScrollBarInfo.knob == B_KNOB_STYLE_DOTS;
int32 hextent = 0; int32 hextent = 0;
int32 vextent = 0; int32 vextent = 0;
src/preferences/appearance/FakeScrollBar.cpp
+2 -2
View File
@@ -143,11 +143,11 @@ FakeScrollBar::Draw(BRect updateRect)
be_control_look->DrawButtonBackground(this, bgRect, updateRect, be_control_look->DrawButtonBackground(this, bgRect, updateRect,
normal, 0, BControlLook::B_ALL_BORDERS, B_HORIZONTAL); normal, 0, BControlLook::B_ALL_BORDERS, B_HORIZONTAL);
if (fKnobStyle == KNOB_STYLE_NONE) if (fKnobStyle == B_KNOB_STYLE_NONE)
return; return;
// draw the scrollbar thumb knobs // draw the scrollbar thumb knobs
bool square = fKnobStyle == KNOB_STYLE_DOTS; bool square = fKnobStyle == B_KNOB_STYLE_DOTS;
int32 hextent = 0; int32 hextent = 0;
int32 vextent = 0; int32 vextent = 0;
src/preferences/appearance/LookAndFeelSettingsView.cpp
+16 -16
View File
@@ -85,9 +85,9 @@ LookAndFeelSettingsView::LookAndFeelSettingsView(const char* name)
fSavedDoubleArrowsValue = _DoubleScrollBarArrows(); fSavedDoubleArrowsValue = _DoubleScrollBarArrows();
fArrowStyleSingle = new FakeScrollBar(true, false, KNOB_STYLE_LINES, fArrowStyleSingle = new FakeScrollBar(true, false, B_KNOB_STYLE_LINES,
new BMessage(kMsgArrowStyleSingle)); new BMessage(kMsgArrowStyleSingle));
fArrowStyleDouble = new FakeScrollBar(true, true, KNOB_STYLE_LINES, fArrowStyleDouble = new FakeScrollBar(true, true, B_KNOB_STYLE_LINES,
new BMessage(kMsgArrowStyleDouble)); new BMessage(kMsgArrowStyleDouble));
BView* arrowStyleView; BView* arrowStyleView;
@@ -111,11 +111,11 @@ LookAndFeelSettingsView::LookAndFeelSettingsView(const char* name)
BBox* knobStyleBox = new BBox("knob style"); BBox* knobStyleBox = new BBox("knob style");
knobStyleBox->SetLabel(B_TRANSLATE("Knob style")); knobStyleBox->SetLabel(B_TRANSLATE("Knob style"));
fKnobStyleNone = new FakeScrollBar(false, false, KNOB_STYLE_NONE, fKnobStyleNone = new FakeScrollBar(false, false, B_KNOB_STYLE_NONE,
new BMessage(kMsgKnobStyleNone)); new BMessage(kMsgKnobStyleNone));
fKnobStyleDots = new FakeScrollBar(false, false, KNOB_STYLE_DOTS, fKnobStyleDots = new FakeScrollBar(false, false, B_KNOB_STYLE_DOTS,
new BMessage(kMsgKnobStyleDots)); new BMessage(kMsgKnobStyleDots));
fKnobStyleLines = new FakeScrollBar(false, false, KNOB_STYLE_LINES, fKnobStyleLines = new FakeScrollBar(false, false, B_KNOB_STYLE_LINES,
new BMessage(kMsgKnobStyleLines)); new BMessage(kMsgKnobStyleLines));
BView* knobStyleView; BView* knobStyleView;
@@ -184,15 +184,15 @@ LookAndFeelSettingsView::AttachedToWindow()
fArrowStyleSingle->SetValue(B_CONTROL_ON); fArrowStyleSingle->SetValue(B_CONTROL_ON);
switch (fSavedKnobStyleValue) { switch (fSavedKnobStyleValue) {
case KNOB_STYLE_NONE: case B_KNOB_STYLE_NONE:
fKnobStyleNone->SetValue(B_CONTROL_ON); fKnobStyleNone->SetValue(B_CONTROL_ON);
break; break;
case KNOB_STYLE_DOTS: case B_KNOB_STYLE_DOTS:
fKnobStyleDots->SetValue(B_CONTROL_ON); fKnobStyleDots->SetValue(B_CONTROL_ON);
break; break;
case KNOB_STYLE_LINES: case B_KNOB_STYLE_LINES:
fKnobStyleLines->SetValue(B_CONTROL_ON); fKnobStyleLines->SetValue(B_CONTROL_ON);
break; break;
} }
@@ -249,15 +249,15 @@ LookAndFeelSettingsView::MessageReceived(BMessage *msg)
break; break;
case kMsgKnobStyleNone: case kMsgKnobStyleNone:
_SetScrollBarKnobStyle(KNOB_STYLE_NONE); _SetScrollBarKnobStyle(B_KNOB_STYLE_NONE);
break; break;
case kMsgKnobStyleDots: case kMsgKnobStyleDots:
_SetScrollBarKnobStyle(KNOB_STYLE_DOTS); _SetScrollBarKnobStyle(B_KNOB_STYLE_DOTS);
break; break;
case kMsgKnobStyleLines: case kMsgKnobStyleLines:
_SetScrollBarKnobStyle(KNOB_STYLE_LINES); _SetScrollBarKnobStyle(B_KNOB_STYLE_LINES);
break; break;
default: default:
@@ -379,15 +379,15 @@ LookAndFeelSettingsView::_SetScrollBarKnobStyle(int32 knobStyle)
set_scroll_bar_info(&info); set_scroll_bar_info(&info);
switch (knobStyle) { switch (knobStyle) {
case KNOB_STYLE_NONE: case B_KNOB_STYLE_NONE:
fKnobStyleNone->SetValue(B_CONTROL_ON); fKnobStyleNone->SetValue(B_CONTROL_ON);
break; break;
case KNOB_STYLE_DOTS: case B_KNOB_STYLE_DOTS:
fKnobStyleDots->SetValue(B_CONTROL_ON); fKnobStyleDots->SetValue(B_CONTROL_ON);
break; break;
case KNOB_STYLE_LINES: case B_KNOB_STYLE_LINES:
fKnobStyleLines->SetValue(B_CONTROL_ON); fKnobStyleLines->SetValue(B_CONTROL_ON);
break; break;
} }
@@ -401,7 +401,7 @@ LookAndFeelSettingsView::IsDefaultable()
{ {
return fCurrentDecor != fDecorUtility.DefaultDecorator()->Name() return fCurrentDecor != fDecorUtility.DefaultDecorator()->Name()
|| _DoubleScrollBarArrows() != false || _DoubleScrollBarArrows() != false
|| _ScrollBarKnobStyle() != KNOB_STYLE_DOTS; || _ScrollBarKnobStyle() != B_KNOB_STYLE_DOTS;
} }
@@ -410,7 +410,7 @@ LookAndFeelSettingsView::SetDefaults()
{ {
_SetDecor(fDecorUtility.DefaultDecorator()); _SetDecor(fDecorUtility.DefaultDecorator());
_SetDoubleScrollBarArrows(false); _SetDoubleScrollBarArrows(false);
_SetScrollBarKnobStyle(KNOB_STYLE_DOTS); _SetScrollBarKnobStyle(B_KNOB_STYLE_DOTS);
} }