diff --git a/src/dlangui/platforms/common/platform.d b/src/dlangui/platforms/common/platform.d
index e373327e..346e15cd 100644
--- a/src/dlangui/platforms/common/platform.d
+++ b/src/dlangui/platforms/common/platform.d
@@ -622,8 +622,11 @@ class Window : CustomEventTarget {
targetState = State.Focused | State.KeyboardFocused;
if (oldFocus is newFocus)
return oldFocus;
- if (oldFocus !is null)
+ if (oldFocus !is null) {
oldFocus.resetState(targetState);
+ if (oldFocus)
+ oldFocus.focusGroupFocused(false);
+ }
if (newFocus is null || isChild(newFocus)) {
if (newFocus !is null) {
// when calling, setState(focused), window.focusedWidget is still previously focused widget
@@ -631,6 +634,8 @@ class Window : CustomEventTarget {
newFocus.setState(targetState);
}
_focusedWidget = newFocus;
+ if (_focusedWidget)
+ _focusedWidget.focusGroupFocused(true);
// after focus change, ask for actions update automatically
//requestActionsUpdate();
}
diff --git a/src/dlangui/widgets/docks.d b/src/dlangui/widgets/docks.d
index 9fb8a83d..5ddedcdb 100644
--- a/src/dlangui/widgets/docks.d
+++ b/src/dlangui/widgets/docks.d
@@ -321,6 +321,7 @@ class DockWindow : WindowFrame {
this(string ID) {
super(ID);
+ focusGroup = true;
}
override protected void initialize() {
diff --git a/src/dlangui/widgets/tabs.d b/src/dlangui/widgets/tabs.d
index a1576f0c..6dba34c9 100644
--- a/src/dlangui/widgets/tabs.d
+++ b/src/dlangui/widgets/tabs.d
@@ -120,6 +120,7 @@ class TabItemWidget : HorizontalLayout {
setItem(item);
clickable = true;
trackHover = true;
+ _label.trackHover = true;
}
void setStyles(string tabButtonStyle, string tabButtonTextStyle) {
styleId = tabButtonStyle;
@@ -814,9 +815,10 @@ class TabWidget : VerticalLayout, TabHandler, TabCloseHandler {
}
/// change style ids
- void setStyles(string tabWidgetStyle, string tabStyle, string tabButtonStyle, string tabButtonTextStyle) {
+ void setStyles(string tabWidgetStyle, string tabStyle, string tabButtonStyle, string tabButtonTextStyle, string tabHostStyle = null) {
styleId = tabWidgetStyle;
_tabControl.setStyles(tabStyle, tabButtonStyle, tabButtonTextStyle);
+ _tabHost.styleId = tabHostStyle;
}
private bool _tabNavigationInProgress;
diff --git a/src/dlangui/widgets/widget.d b/src/dlangui/widgets/widget.d
index ff1b893a..3021c6e6 100644
--- a/src/dlangui/widgets/widget.d
+++ b/src/dlangui/widgets/widget.d
@@ -282,7 +282,9 @@ public:
@property uint state() const {
if ((_state & State.Parent) != 0 && _parent !is null)
return _parent.state;
- return _state | State.WindowFocused; // TODO:
+ if (focusGroupFocused)
+ return _state | State.WindowFocused; // TODO:
+ return _state;
}
/// override to handle focus changes
protected void handleFocusChange(bool focused, bool receivedFocusFromKeyboard = false) {
@@ -296,6 +298,8 @@ public:
}
/// set new widget state (set of flags from State enum)
@property Widget state(uint newState) {
+ if ((_state & State.Parent) != 0 && _parent !is null)
+ return _parent.state(newState);
if (newState != _state) {
uint oldState = _state;
_state = newState;
@@ -791,10 +795,41 @@ public:
@property bool focusGroup() { return _focusGroup; }
/// set focus group flag for container widget
@property Widget focusGroup(bool flg) { _focusGroup = flg; return this; }
+ @property bool focusGroupFocused() const {
+ Widget w = focusGroupWidget();
+ return (w._state & State.WindowFocused) != 0;
+ }
+ protected bool setWindowFocusedFlag(bool flg) {
+ if (flg) {
+ if ((_state & State.WindowFocused) == 0) {
+ _state |= State.WindowFocused;
+ invalidate();
+ return true;
+ }
+ } else {
+ if ((_state & State.WindowFocused) != 0) {
+ _state &= ~State.WindowFocused;
+ invalidate();
+ return true;
+ }
+ }
+ return false;
+ }
+ @property Widget focusGroupFocused(bool flg) {
+ Widget w = focusGroupWidget();
+ w.setWindowFocusedFlag(flg);
+ while (w.parent) {
+ w = w.parent;
+ if (w.parent is null || w.focusGroup) {
+ w.setWindowFocusedFlag(flg);
+ }
+ }
+ return this;
+ }
/// find nearest parent of this widget with focusGroup flag, returns topmost parent if no focusGroup flag set to any of parents.
- Widget focusGroupWidget() {
- Widget p = this;
+ Widget focusGroupWidget() inout {
+ Widget p = cast(Widget)this;
while (p) {
if (!p.parent || p.focusGroup)
break;
@@ -1694,6 +1729,11 @@ class WidgetGroup : Widget {
_children.clear(destroyObj);
}
+ /// replace child with other child
+ void replaceChild(Widget newChild, Widget oldChild) {
+ _children.replace(newChild, oldChild);
+ }
+
}
/** WidgetGroup with default drawing of children (just draw all children) */
diff --git a/src/dlangui/widgets/winframe.d b/src/dlangui/widgets/winframe.d
index f322449c..dd656ad5 100644
--- a/src/dlangui/widgets/winframe.d
+++ b/src/dlangui/widgets/winframe.d
@@ -27,7 +27,7 @@ class WindowFrame : VerticalLayout {
protected Widget _bodyWidget;
@property Widget bodyWidget() { return _bodyWidget; }
@property void bodyWidget(Widget widget) {
- _children.replace(widget, _bodyWidget);
+ _bodyLayout.replaceChild(widget, _bodyWidget);
_bodyWidget = widget;
_bodyWidget.layoutWidth(FILL_PARENT).layoutHeight(FILL_PARENT);
_bodyWidget.parent = this;
@@ -38,6 +38,7 @@ class WindowFrame : VerticalLayout {
protected TextWidget _caption;
protected ImageButton _closeButton;
protected bool _showCloseButton;
+ protected HorizontalLayout _bodyLayout;
@property TextWidget caption() { return _caption; }
@@ -76,11 +77,16 @@ class WindowFrame : VerticalLayout {
_captionLayout.addChild(_caption);
_captionLayout.addChild(_closeButton);
+ _bodyLayout = new HorizontalLayout();
+ _bodyLayout.styleId = STYLE_DOCK_WINDOW_BODY;
+
_bodyWidget = createBodyWidget();
- _bodyWidget.styleId = STYLE_DOCK_WINDOW_BODY;
+ _bodyLayout.addChild(_bodyWidget);
+ _bodyWidget.layoutWidth(FILL_PARENT).layoutHeight(FILL_PARENT);
+ //_bodyWidget.styleId = STYLE_DOCK_WINDOW_BODY;
addChild(_captionLayout);
- addChild(_bodyWidget);
+ addChild(_bodyLayout);
}
protected Widget createBodyWidget() {
diff --git a/views/res/dock_window_background.xml b/views/res/dock_window_background.xml
new file mode 100644
index 00000000..f4972e45
--- /dev/null
+++ b/views/res/dock_window_background.xml
@@ -0,0 +1,8 @@
+
+
+