Revert "BScrollBar: Add lines and dots knob styles to scroll bar"
This reverts commit ec1b18c58a.
This was not well enough reviewed, and it seems that at least some
consumers of the old API (e.g. WebPositive) need more than the new one provides.
Change-Id: Ie7ad1fc70dab889922424298661504b00f66d31d
This commit is contained in:
@@ -157,17 +157,15 @@ public:
|
||||
const rgb_color& base,
|
||||
uint32 flags = 0);
|
||||
|
||||
virtual void DrawScrollBar(BView* view, BRect& rect,
|
||||
virtual void DrawScrollBarBackground(BView* view,
|
||||
BRect& rect1, BRect& rect2,
|
||||
const BRect& updateRect,
|
||||
const rgb_color& base, uint32 flags,
|
||||
orientation orientation,
|
||||
bool doubleArrows = false,
|
||||
int32 buttonDown = -1);
|
||||
virtual void DrawScrollBarThumb(BView* view, BRect& rect,
|
||||
BRect& thumbRect, const BRect& updateRect,
|
||||
orientation orientation);
|
||||
virtual void DrawScrollBarBackground(BView* view,
|
||||
BRect& rect, const BRect& updateRect,
|
||||
const rgb_color& base, uint32 flags,
|
||||
orientation orientation,
|
||||
uint32 knobStyle = 0);
|
||||
orientation orientation);
|
||||
|
||||
virtual void DrawScrollViewFrame(BView* view,
|
||||
BRect& rect, const BRect& updateRect,
|
||||
@@ -561,26 +559,6 @@ protected:
|
||||
const rgb_color& base, rgb_color& color,
|
||||
uint32 flags) const;
|
||||
|
||||
void _DrawScrollBarBackground(BView* view,
|
||||
BRect& rect1, BRect& rect2,
|
||||
const BRect& updateRect,
|
||||
const rgb_color& base, uint32 flags,
|
||||
orientation orientation);
|
||||
void _DrawScrollBarBackground(BView* view,
|
||||
BRect& rect, const BRect& updateRect,
|
||||
const rgb_color& base, uint32 flags,
|
||||
orientation orientation);
|
||||
void _DrawDisabledScrollBarBackground(BView* view,
|
||||
BRect rect, orientation orientation,
|
||||
const rgb_color& light,
|
||||
const rgb_color& dark,
|
||||
const rgb_color& fill);
|
||||
void _DrawScrollBarArrowButton(BView* view,
|
||||
BRect rect, const BRect& updateRect,
|
||||
const rgb_color& base, uint32 flags,
|
||||
int32 direction, orientation orientation,
|
||||
bool doubleArrows, bool down);
|
||||
|
||||
private:
|
||||
bool fCachedOutline;
|
||||
};
|
||||
|
||||
@@ -1,32 +0,0 @@
|
||||
/*
|
||||
* Copyright 2018 Haiku, Inc. All rights reserved.
|
||||
* Distributed under the terms of the MIT License.
|
||||
*
|
||||
* Authors:
|
||||
* John Scipione, [email protected]
|
||||
*/
|
||||
#ifndef _SCROLL_BAR_PRIVATE_H
|
||||
#define _SCROLL_BAR_PRIVATE_H
|
||||
|
||||
// Constants for determining which arrow is down and are defined with respect
|
||||
// to double arrow mode. ARROW_1 and ARROW_4 refer to the outer pair of arrows
|
||||
// while ARROW_2 and ARROW_3 refer to the inner ones. ARROW_1 point left/up
|
||||
// and ARROW_4 points right/down. THUMB is the scroll bar thumb.
|
||||
enum {
|
||||
SCROLL_NO_ARROW = -1,
|
||||
SCROLL_ARROW_1,
|
||||
SCROLL_ARROW_2,
|
||||
SCROLL_ARROW_3,
|
||||
SCROLL_ARROW_4,
|
||||
SCROLL_THUMB
|
||||
};
|
||||
|
||||
// constants for determining which knob style to draw on scroll bar
|
||||
typedef enum {
|
||||
KNOB_NONE = 0,
|
||||
KNOB_DOTS,
|
||||
KNOB_LINES
|
||||
} knob_style;
|
||||
|
||||
|
||||
#endif // _SCROLL_BAR_PRIVATE_H
|
||||
Reference in New Issue
Block a user