diff --git a/src/dlangui/widgets/menu.d b/src/dlangui/widgets/menu.d
index 90d1c116..7250a22c 100644
--- a/src/dlangui/widgets/menu.d
+++ b/src/dlangui/widgets/menu.d
@@ -952,18 +952,21 @@ class MainMenu : MenuWidgetBase {
}
}
- if (event.action == KeyAction.KeyDown && isAlt && noOtherModifiers) {
- _menuToggleState = 1;
- } else if (event.action == KeyAction.KeyUp && isAlt && noOtherModifiers) {
- if (_menuToggleState == 1)
- toggleMenu = true;
- _menuToggleState = 0;
- } else {
- _menuToggleState = 0;
- }
- if (toggleMenu) {
- toggle();
- return true;
+ // toggle menu by single Alt press - for Windows only!
+ version (Windows) {
+ if (event.action == KeyAction.KeyDown && isAlt && noOtherModifiers) {
+ _menuToggleState = 1;
+ } else if (event.action == KeyAction.KeyUp && isAlt && noOtherModifiers) {
+ if (_menuToggleState == 1)
+ toggleMenu = true;
+ _menuToggleState = 0;
+ } else {
+ _menuToggleState = 0;
+ }
+ if (toggleMenu) {
+ toggle();
+ return true;
+ }
}
if (!focused)
return false;
diff --git a/src/dlangui/widgets/tabs.d b/src/dlangui/widgets/tabs.d
index 78650a9f..a377411d 100644
--- a/src/dlangui/widgets/tabs.d
+++ b/src/dlangui/widgets/tabs.d
@@ -126,6 +126,10 @@ class TabItemWidget : HorizontalLayout {
styleId = tabButtonStyle;
_label.styleId = tabButtonTextStyle;
}
+ override void onDraw(DrawBuf buf) {
+ //debug Log.d("TabWidget.onDraw ", id);
+ super.onDraw(buf);
+ }
protected bool onClick(Widget source) {
if (source.compareId("CLOSE")) {
Log.d("tab close button pressed");
@@ -522,6 +526,7 @@ class TabControl : WidgetGroupDefaultDrawing {
override void onDraw(DrawBuf buf) {
if (visibility != Visibility.Visible)
return;
+ //debug Log.d("TabControl.onDraw enter");
super.Widget.onDraw(buf);
Rect rc = _pos;
applyMargins(rc);
@@ -545,6 +550,7 @@ class TabControl : WidgetGroupDefaultDrawing {
continue;
item.onDraw(buf);
}
+ //debug Log.d("TabControl.onDraw exit");
}
protected string _selectedTabId;
diff --git a/views/res/tab_btn_up.xml b/views/res/tab_btn_up.xml
index bcae788c..c33460f4 100644
--- a/views/res/tab_btn_up.xml
+++ b/views/res/tab_btn_up.xml
@@ -3,12 +3,12 @@
android:constantSize="true"
android:dither="false"
android:variablePadding="false" >
-
+
diff --git a/views/res/tab_btn_up_hover.9.png b/views/res/tab_btn_up_hover.9.png
index fc8d89bf..92cd5db1 100644
Binary files a/views/res/tab_btn_up_hover.9.png and b/views/res/tab_btn_up_hover.9.png differ
diff --git a/views/res/tab_btn_up_normal.9.png b/views/res/tab_btn_up_normal.9.png
index 9b355693..1c0ead14 100644
Binary files a/views/res/tab_btn_up_normal.9.png and b/views/res/tab_btn_up_normal.9.png differ
diff --git a/views/res/tab_btn_up_selected.9.png b/views/res/tab_btn_up_selected.9.png
index 39e66dc8..4400af65 100644
Binary files a/views/res/tab_btn_up_selected.9.png and b/views/res/tab_btn_up_selected.9.png differ
diff --git a/views/res/tab_up_background.9.png b/views/res/tab_up_background.9.png
index 09407ac3..e1f9a575 100644
Binary files a/views/res/tab_up_background.9.png and b/views/res/tab_up_background.9.png differ
diff --git a/views/res/theme_default.xml b/views/res/theme_default.xml
index 44b2b700..2d5cd4f3 100644
--- a/views/res/theme_default.xml
+++ b/views/res/theme_default.xml
@@ -1,6 +1,6 @@
@@ -202,7 +202,7 @@
-
+