forks
/
dlangui
mirror of https://github.com/buggins/dlangui.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

scrollbars support

This commit is contained in:
Vadim Lopatin 2014-03-25 11:49:26 +04:00
parent 1dfb88defd
commit 7eaf08aec3
13 changed files with 127 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dlanguilib.visualdproj
View File

@ -66,7 +66,7 @@
<debuglevel>0</debuglevel>
<debugids />
<versionlevel>0</versionlevel>
<versionids>Unicode</versionids>
<versionids>Unicode USE_OPENGL</versionids>
<dump_source>0</dump_source>
<mapverbosity>0</mapverbosity>
<createImplib>1</createImplib>
@ -190,6 +190,11 @@
</Config>
<Folder name="dlangui">
<Folder name="3rdparty">
<Folder name="DerelictFI">
<File path="..\DerelictFI\source\derelict\freeimage\freeimage.d" />
<File path="..\DerelictFI\source\derelict\freeimage\functions.d" />
<File path="..\DerelictFI\source\derelict\freeimage\types.d" />
</Folder>
<Folder name="DerelictFT">
<File path="..\DerelictFT\source\derelict\freetype\ft.d" />
<File path="..\DerelictFT\source\derelict\freetype\functions.d" />
@ -220,11 +225,6 @@
<File path="..\DerelictUtil\source\derelict\util\wintypes.d" />
<File path="..\DerelictUtil\source\derelict\util\xtypes.d" />
</Folder>
<Folder name="DerelictFI">
<File path="..\DerelictFI\source\derelict\freeimage\freeimage.d" />
<File path="..\DerelictFI\source\derelict\freeimage\functions.d" />
<File path="..\DerelictFI\source\derelict\freeimage\types.d" />
</Folder>
<Folder name="gl3n">
<File path="..\gl3n\gl3n\aabb.d" />
<File path="..\gl3n\gl3n\frustum.d" />

2
examples/example1/example1.visualdproj
View File

@ -66,7 +66,7 @@
<debuglevel>0</debuglevel>
<debugids />
<versionlevel>0</versionlevel>
<versionids>Unicode</versionids>
<versionids>Unicode USE_OPENGL</versionids>
<dump_source>0</dump_source>
<mapverbosity>0</mapverbosity>
<createImplib>0</createImplib>

BIN
examples/example1/res/btn_default_small_normal.9.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 582 B

BIN
examples/example1/res/btn_default_small_normal_disable.9.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 557 B

BIN
examples/example1/res/btn_default_small_normal_hover.9.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 670 B

BIN
examples/example1/res/btn_default_small_pressed.9.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 497 B

BIN
examples/example1/res/btn_default_small_selected.9.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 481 B

BIN
examples/example1/res/expander_close_holo_light.9.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 371 B

39
src/dlangui/core/events.d
View File

@ -115,3 +115,42 @@ class MouseEvent {
_wheelDelta = wheelDelta;
}
}
enum ScrollAction : ubyte {
/// space above indicator pressed
PageUp,
/// space below indicator pressed
PageDown,
/// up/left button pressed
LineUp,
/// down/right button pressed
LineDown,
/// slider pressed
SliderPressed,
/// dragging in progress
SliderMoved,
/// dragging finished
SliderReleased
}
/// slider/scrollbar event
class ScrollEvent {
private ScrollAction _action;
private int _minValue;
private int _maxValue;
private int _pageSize;
private int _position;
@property ScrollAction action() { return _action; }
@property int minValue() { return _minValue; }
@property int maxValue() { return _maxValue; }
@property int pageSize() { return _pageSize; }
@property int position() { return _position; }
this(ScrollAction action, int minValue, int maxValue, int pageSize, int position) {
_action = action;
_minValue = minValue;
_maxValue = minValue;
_pageSize = pageSize;
_position = position;
}
}

6
src/dlangui/platforms/windows/winapp.d
View File

@ -324,7 +324,7 @@ class Win32Window : Window {
private bool _mouseTracking;
private bool onMouse(uint message, uint flags, short x, short y) {
Log.d("Win32 Mouse Message ", message, " flags=", flags, " x=", x, " y=", y);
//Log.d("Win32 Mouse Message ", message, " flags=", flags, " x=", x, " y=", y);
MouseButton button = MouseButton.None;
MouseAction action = MouseAction.ButtonDown;
ButtonDetails * pbuttonDetails = null;
@ -559,7 +559,7 @@ int myWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int
Platform.setInstance(platform);
if (true) {
if (false) {
/// testing freetype font manager
import dlangui.graphics.ftfonts;
import win32.shlobj;
@ -607,7 +607,7 @@ int myWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int
// just to check OpenGL context
Log.i("Trying to setup OpenGL context");
Win32Window tmpWindow = new Win32Window("", null);
Win32Window tmpWindow = new Win32Window(platform, "", null);
destroy(tmpWindow);
if (openglEnabled)
Log.i("OpenGL support is enabled");

66
src/dlangui/widgets/controls.d
View File

@ -154,7 +154,9 @@ class Button : Widget {
class ScrollBar : WidgetGroup, OnClickHandler {
protected ImageButton _btnBack;
protected ImageButton _btnForward;
protected ImageButton _indicator;
protected SliderButton _indicator;
protected PageScrollButton _pageUp;
protected PageScrollButton _pageDown;
protected Rect _scrollArea;
protected int _btnSize;
protected int _minIndicatorSize;
@ -163,13 +165,20 @@ class ScrollBar : WidgetGroup, OnClickHandler {
protected int _pageSize = 30;
protected int _position = 20;
class IndicatorButton : ImageButton {
class PageScrollButton : Widget {
this(string ID) {
super(ID);
styleId = "PAGE_SCROLL";
}
}
class SliderButton : ImageButton {
Point _dragStart;
int _dragStartPosition;
bool _dragging;
Rect _dragStartRect;
this(string resourceId) {
super("INDICATOR", resourceId);
super("SLIDER", resourceId);
}
/// process mouse event; return true if event is processed by widget.
@ -229,7 +238,7 @@ class ScrollBar : WidgetGroup, OnClickHandler {
return true;
}
if (event.action == MouseAction.Cancel) {
Log.d("IndicatorButton.onMouseEvent event.action == MouseAction.Cancel");
Log.d("SliderButton.onMouseEvent event.action == MouseAction.Cancel");
resetState(State.Pressed);
_dragging = false;
return true;
@ -293,16 +302,24 @@ class ScrollBar : WidgetGroup, OnClickHandler {
this(string ID = null, Orientation orient = Orientation.Vertical) {
super(ID);
styleId = "BUTTON";
styleId = "SCROLLBAR";
_orientation = orient;
_btnBack = new ImageButton("BACK", style.customDrawableId(_orientation == Orientation.Vertical ? ATTR_SCROLLBAR_BUTTON_UP : ATTR_SCROLLBAR_BUTTON_LEFT));
_btnForward = new ImageButton("FORWARD", style.customDrawableId(_orientation == Orientation.Vertical ? ATTR_SCROLLBAR_BUTTON_DOWN : ATTR_SCROLLBAR_BUTTON_RIGHT));
_indicator = new IndicatorButton(style.customDrawableId(_orientation == Orientation.Vertical ? ATTR_SCROLLBAR_INDICATOR_VERTICAL : ATTR_SCROLLBAR_INDICATOR_HORIZONTAL));
_pageUp = new PageScrollButton("PAGE_UP");
_pageDown = new PageScrollButton("PAGE_DOWN");
_btnBack.styleId("SCROLLBAR_BUTTON");
_btnForward.styleId("SCROLLBAR_BUTTON");
_indicator = new SliderButton(style.customDrawableId(_orientation == Orientation.Vertical ? ATTR_SCROLLBAR_INDICATOR_VERTICAL : ATTR_SCROLLBAR_INDICATOR_HORIZONTAL));
addChild(_btnBack);
addChild(_btnForward);
addChild(_indicator);
addChild(_pageUp);
addChild(_pageDown);
_btnBack.onClickListener = &onClick;
_btnForward.onClickListener = &onClick;
_pageUp.onClickListener = &onClick;
_pageDown.onClickListener = &onClick;
}
override void measure(int parentWidth, int parentHeight) {
@ -310,6 +327,8 @@ class ScrollBar : WidgetGroup, OnClickHandler {
_btnBack.measure(parentWidth, parentHeight);
_btnForward.measure(parentWidth, parentHeight);
_indicator.measure(parentWidth, parentHeight);
_pageUp.measure(parentWidth, parentHeight);
_pageDown.measure(parentWidth, parentHeight);
_btnSize = _btnBack.measuredWidth;
_minIndicatorSize = _orientation == Orientation.Vertical ? _indicator.measuredHeight : _indicator.measuredWidth;
if (_btnSize < _btnBack.measuredHeight)
@ -354,6 +373,22 @@ class ScrollBar : WidgetGroup, OnClickHandler {
irc.top += spaceBackSize;
irc.bottom -= spaceForwardSize;
_indicator.layout(irc);
if (_scrollArea.top < irc.top) {
r = _scrollArea;
r.bottom = irc.top;
_pageUp.layout(r);
_pageUp.visibility = Visibility.Visible;
} else {
_pageUp.visibility = Visibility.Invisible;
}
if (_scrollArea.bottom > irc.bottom) {
r = _scrollArea;
r.top = irc.bottom;
_pageDown.layout(r);
_pageDown.visibility = Visibility.Visible;
} else {
_pageDown.visibility = Visibility.Invisible;
}
} else {
// horizontal
int backbtnpos = rc.left + _btnSize;
@ -375,12 +410,29 @@ class ScrollBar : WidgetGroup, OnClickHandler {
irc.left += spaceBackSize;
irc.right -= spaceForwardSize;
_indicator.layout(irc);
if (_scrollArea.left < irc.left) {
r = _scrollArea;
r.right = irc.left;
_pageUp.layout(r);
_pageUp.visibility = Visibility.Visible;
} else {
_pageUp.visibility = Visibility.Invisible;
}
if (_scrollArea.right > irc.right) {
r = _scrollArea;
r.left = irc.right;
_pageDown.layout(r);
_pageDown.visibility = Visibility.Visible;
} else {
_pageDown.visibility = Visibility.Invisible;
}
}
_pos = rc;
_needLayout = false;
}
override bool onClick(Widget source) {
Log.d("Scrollbar.onClick ", source.id);
return true;
}
@ -395,6 +447,8 @@ class ScrollBar : WidgetGroup, OnClickHandler {
ClipRectSaver(buf, rc);
_btnForward.onDraw(buf);
_btnBack.onDraw(buf);
_pageUp.onDraw(buf);
_pageDown.onDraw(buf);
_indicator.onDraw(buf);
}
}

14
src/dlangui/widgets/styles.d
View File

@ -488,7 +488,7 @@ class Style {
if (state == 0)
return this;
//Log.d("forState ", state, " styleId=", _id, " substates=", _substates.length);
if (id is null && parentStyle !is null && _substates.length == 0)
if (parentStyle !is null && _substates.length == 0) //id is null &&
return parentStyle.forState(state);
foreach(item; _substates) {
if ((item._stateMask & state) == item._stateValue)
@ -616,7 +616,7 @@ Theme createDefaultTheme() {
Log.d("Creating default theme");
Theme res = new Theme("default");
Style button = res.createSubstyle("BUTTON").backgroundImageId("btn_default_small_normal").alignment(Align.Center);
Style text = res.createSubstyle("TEXT").margins(Rect(3,3,3,3)).padding(Rect(3,3,3,3));
Style text = res.createSubstyle("TEXT").margins(Rect(2,2,2,2)).padding(Rect(1,1,1,1));
button.createState(State.Disabled | State.Focused, State.Disabled | State.Focused).backgroundImageId("btn_default_small_normal_disable_focused");
button.createState(State.Disabled, State.Disabled).backgroundImageId("btn_default_small_normal_disable");
button.createState(State.Pressed, State.Pressed).backgroundImageId("btn_default_small_pressed");
@ -627,7 +627,15 @@ Theme createDefaultTheme() {
res.setCustomDrawable(ATTR_SCROLLBAR_BUTTON_RIGHT, "scrollbar_btn_right");
res.setCustomDrawable(ATTR_SCROLLBAR_INDICATOR_VERTICAL, "scrollbar_indicator_vertical");
res.setCustomDrawable(ATTR_SCROLLBAR_INDICATOR_HORIZONTAL, "scrollbar_indicator_horizontal");
res.dumpStats();
Style scrollbar = res.createSubstyle("SCROLLBAR");
Style scrollbarButton = button.createSubstyle("SCROLLBAR_BUTTON");
scrollbar.backgroundColor(0xC0C0C0C0);
Style scrollbarSlider = res.createSubstyle("SLIDER");
Style scrollbarPage = res.createSubstyle("PAGE_SCROLL").backgroundColor(0xFFFFFFFF); // transparent
scrollbarPage.createState(State.Pressed, State.Pressed).backgroundColor(0xC0404040);
//res.dumpStats();
return res;
}

10
src/dlangui/widgets/widget.d
View File

@ -35,6 +35,10 @@ interface OnClickHandler {
bool onClick(Widget source);
}
interface OnScrollHandler {
bool onScrollEvent(Widget source, ScrollEvent event);
}
class Widget {
/// widget id
protected string _id;
@ -63,17 +67,17 @@ class Widget {
/// window (to be used for top level widgets only!)
protected Window _window;
private static int _instanceCount = 0;
//private static int _instanceCount = 0;
/// create widget, with optional id
this(string ID = null) {
_id = ID;
Log.d("Created widget, count = ", ++_instanceCount);
//Log.d("Created widget, count = ", ++_instanceCount);
}
~this() {
if (_ownStyle !is null)
destroy(_ownStyle);
_ownStyle = null;
Log.d("Destroyed widget, count = ", --_instanceCount);
//Log.d("Destroyed widget, count = ", --_instanceCount);
}
/// accessor to style - by lookup in theme by styleId (if style id is not set, theme base style will be used).