From e7cd6a2c9d1aceca043b809350d7a79dbe722931 Mon Sep 17 00:00:00 2001
From: Vadim Lopatin <coolreader.org@gmail.com>
Date: Wed, 14 Jan 2015 15:59:42 +0300
Subject: [PATCH] fix combobox style and disabled state handling for combobox

---
 res/btn_background_transparent.xml |  4 ++--
 res/theme_default.xml              |  2 ++
 src/dlangui/widgets/combobox.d     | 12 +++++++++++-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/res/btn_background_transparent.xml b/res/btn_background_transparent.xml
index f96baa91..74b8b30a 100644
--- a/res/btn_background_transparent.xml
+++ b/res/btn_background_transparent.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android" >
   <item
-    android:drawable="btn_disabled"
+    android:drawable="@null"
     android:state_enabled="false"/>
   <item
     android:drawable="@null"
@@ -11,7 +11,7 @@
     android:state_pressed="true" />
   <item
     android:drawable="btn_hover"
-    android:state_hovered="true" />
+    android:state_hovered="true" android:state_enabled="true" />
   <item
     android:drawable="@null" />
 </selector>
diff --git a/res/theme_default.xml b/res/theme_default.xml
index 20df9b48..c01cf0b8 100644
--- a/res/theme_default.xml
+++ b/res/theme_default.xml
@@ -190,6 +190,7 @@
         fontFamily="SansSerif"
         fontSize="16"
         />
+
     <style id="COMBO_BOX"
         backgroundImageId="btn_background"
         padding="2,2,2,2"
@@ -213,6 +214,7 @@
         backgroundImageId="btn_background_transparent"
         align="Center"
         />
+
     <style id="EDIT_BOX"
         backgroundImageId="editbox_background"
         padding="5,6,5,6"
diff --git a/src/dlangui/widgets/combobox.d b/src/dlangui/widgets/combobox.d
index 8b906e88..442bd133 100644
--- a/src/dlangui/widgets/combobox.d
+++ b/src/dlangui/widgets/combobox.d
@@ -73,8 +73,18 @@ class ComboBoxBase : HorizontalLayout, OnClickHandler {
             onItemClickListener(this, index);
     }
 
+	/// change enabled state
+    override @property Widget enabled(bool flg) { 
+        super.enabled(flg);
+        _button.enabled = flg;
+        return this; 
+    }
+	/// return true if state has State.Enabled flag set
+    override @property bool enabled() { return super.enabled; }
+
     override bool onClick(Widget source) {
-        showPopup();
+        if (enabled)
+            showPopup();
         return true;
     }