From a276806ef3e8adeef3c01c0b43d401c11ee3f706 Mon Sep 17 00:00:00 2001
From: Vadim Lopatin <coolreader.org@gmail.com>
Date: Wed, 21 Jan 2015 17:45:19 +0300
Subject: [PATCH] add toolbar styled combobox

---
 res/mdpi/toolbar_control_disabled.9.png | Bin 0 -> 249 bytes
 res/mdpi/toolbar_control_normal.9.png   | Bin 0 -> 247 bytes
 res/theme_default.xml                   |   6 ++++++
 res/toolbar_control_background.xml      |  23 +++++++++++++++++++++++
 src/dlangui/widgets/editors.d           |   2 +-
 src/dlangui/widgets/styles.d            |   2 ++
 src/dlangui/widgets/toolbars.d          |  15 +++++++++++++++
 7 files changed, 47 insertions(+), 1 deletion(-)
 create mode 100644 res/mdpi/toolbar_control_disabled.9.png
 create mode 100644 res/mdpi/toolbar_control_normal.9.png
 create mode 100644 res/toolbar_control_background.xml

diff --git a/res/mdpi/toolbar_control_disabled.9.png b/res/mdpi/toolbar_control_disabled.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..1ecea1bb46c118a2a363532f24cd5ba7d86b2b5e
GIT binary patch
literal 249
zcmeAS@N?(olHy`uVBq!ia0vp^Vn8g)!3HFq6y&A?DYhhUcNd0!20;eFy$ee_fg+p*
z9+AZi4BWyX%*Zfnjs#GUy~NYkmHj@WD4#sL&Tg9mpirBqi(`nz>Eu5j9x{VKb3+3I
zv&f%x1%3k~0|SEtXTUOtr|n&S!jwn5KqUI?i4zA79N3WZcHRHBUsWN7U;Z5R=9&0z
zO^*+c36qaVi>BX!Gmn4FU#2H#T5;t;U~~J_gFRQwzPz9QcZ;@J<N{NU!#}&HugEr7
mqczc>r)m1qCspz@`5A=#)$SB8WpxI+h{4m<&t;ucLK6T^a#r&I

literal 0
HcmV?d00001

diff --git a/res/mdpi/toolbar_control_normal.9.png b/res/mdpi/toolbar_control_normal.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..3e94da9c4082a60b1d962bc228c17235fe9b4070
GIT binary patch
literal 247
zcmeAS@N?(olHy`uVBq!ia0vp^Vn8g)!3HFq6y&A?DYhhUcNd0!20;eFy$ee_fg+p*
z9+AZi4BWyX%*Zfnjs#GUy~NYkmHj@WD4!yi@cHNsK%o{-7sn8b)5(86JY)ue=7t6a
zW|2SX3j78}1_lNP&VXeOUum6v!jwnb!@%myi331z!K(1$fBX7>0j%5oV!r%;Km9L{
z5043xk4THA-+?oaf6QN|Cudr5<w0O``_zLySIoWuRrHt?8~SEV=t_xn6N?B{N|a#L
g_dfa6&PblYsw?l&uKz)KK=&|sy85}Sb4q9e04wcO9RL6T

literal 0
HcmV?d00001

diff --git a/res/theme_default.xml b/res/theme_default.xml
index add1b54e..0b1b8bbe 100644
--- a/res/theme_default.xml
+++ b/res/theme_default.xml
@@ -297,6 +297,12 @@
         margins="1,1,1,1"
         padding="4,4,4,4"
         />
+    <style id="TOOLBAR_CONTROL"
+        backgroundImageId="toolbar_control_background"
+        align="Center"
+        margins="1,1,1,1"
+        padding="4,4,4,4"
+        />
     <style id="TOOLBAR_SEPARATOR"
         align="Center"
         />
diff --git a/res/toolbar_control_background.xml b/res/toolbar_control_background.xml
new file mode 100644
index 00000000..4b0df5f7
--- /dev/null
+++ b/res/toolbar_control_background.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+  <item
+    android:drawable="toolbar_control_disabled"
+    android:state_enabled="false"
+    android:state_focused="true" />
+  <item
+    android:drawable="toolbar_button_hover"
+    android:state_hovered="true"
+    android:state_focused="true" />
+  <item
+    android:drawable="toolbar_button_hover"
+    android:state_focused="true" 
+  />
+  <item
+    android:drawable="toolbar_button_pressed"
+    android:state_pressed="true" />
+  <item
+    android:drawable="toolbar_button_hover"
+    android:state_hovered="true" />
+  <item
+    android:drawable="toolbar_control_normal" />
+</selector>
diff --git a/src/dlangui/widgets/editors.d b/src/dlangui/widgets/editors.d
index 47561dbe..291837ee 100644
--- a/src/dlangui/widgets/editors.d
+++ b/src/dlangui/widgets/editors.d
@@ -1072,7 +1072,7 @@ class EditableContent {
         }
     }
     /// save to file in current format
-    bool save(string filename) {
+    bool save(string filename = null) {
         return save(filename, _format);
     }
 }
diff --git a/src/dlangui/widgets/styles.d b/src/dlangui/widgets/styles.d
index d4fd06c2..6c82662b 100644
--- a/src/dlangui/widgets/styles.d
+++ b/src/dlangui/widgets/styles.d
@@ -148,6 +148,8 @@ immutable string STYLE_TOOLBAR_HOST = "TOOLBAR_HOST";
 immutable string STYLE_TOOLBAR = "TOOLBAR";
 /// standard style id for toolbar button
 immutable string STYLE_TOOLBAR_BUTTON = "TOOLBAR_BUTTON";
+/// standard style id for toolbar control, e.g. combobox
+immutable string STYLE_TOOLBAR_CONTROL = "TOOLBAR_CONTROL";
 /// standard style id for toolbar separator
 immutable string STYLE_TOOLBAR_SEPARATOR = "TOOLBAR_SEPARATOR";
 
diff --git a/src/dlangui/widgets/toolbars.d b/src/dlangui/widgets/toolbars.d
index b9d6b9e3..a0a5d910 100644
--- a/src/dlangui/widgets/toolbars.d
+++ b/src/dlangui/widgets/toolbars.d
@@ -24,6 +24,7 @@ module dlangui.widgets.toolbars;
 import dlangui.widgets.widget;
 import dlangui.widgets.layouts;
 import dlangui.widgets.controls;
+import dlangui.widgets.combobox;
 
 /// Layout with several toolbars
 class ToolBarHost : HorizontalLayout {
@@ -76,6 +77,16 @@ class ToolBarSeparator : ImageWidget {
     }
 }
 
+/// separator for toolbars
+class ToolBarComboBox : ComboBox {
+    this(string ID, dstring[] items) {
+        super(ID, items);
+        styleId = STYLE_TOOLBAR_CONTROL;
+        if (items.length > 0)
+            selectedItemIndex = 0;
+    }
+}
+
 /// Layout with buttons
 class ToolBar : HorizontalLayout {
     this(string ID) {
@@ -106,4 +117,8 @@ class ToolBar : HorizontalLayout {
         }
     }
 
+    void addControl(Widget widget) {
+        addChild(widget);
+    }
+
 }