From cf23ce6dbbf83b74252bf42f63b6e4dcfd3bf92d Mon Sep 17 00:00:00 2001
From: ondrej <ondrej@lazarus-ide.org>
Date: Sat, 19 Dec 2015 10:51:28 +0000
Subject: [PATCH] LCL: gtk2: fix toolbutton dropdown arrow painting

git-svn-id: trunk@50929 -
---
 lcl/interfaces/gtk2/gtk2themes.pas | 41 +++++++++++++++++-------------
 1 file changed, 24 insertions(+), 17 deletions(-)

diff --git a/lcl/interfaces/gtk2/gtk2themes.pas b/lcl/interfaces/gtk2/gtk2themes.pas
index 357e27333f..ea791657d5 100644
--- a/lcl/interfaces/gtk2/gtk2themes.pas
+++ b/lcl/interfaces/gtk2/gtk2themes.pas
@@ -370,7 +370,30 @@ begin
           TP_SPLITBUTTON,
           TP_SPLITBUTTONDROPDOWN:
             begin
-              if (Details.Part = TP_SPLITBUTTONDROPDOWN) and (AIndex = 1) then
+              Result.Widget := GetStyleWidget(lgsToolButton);
+              case Details.State of
+                TS_PRESSED, TS_CHECKED, TS_HOTCHECKED:
+                  Result.Shadow := GTK_SHADOW_IN;
+                TS_HOT:
+                  Result.Shadow := GTK_SHADOW_ETCHED_OUT;
+              else
+                Result.Shadow := GTK_SHADOW_NONE;
+              end;
+              if Details.Part = TP_SPLITBUTTONDROPDOWN then
+              begin
+                case Details.State of
+                  TS_DISABLED: Result.State := GTK_STATE_INSENSITIVE;
+                  //TS_HOT: Result.State := GTK_STATE_ACTIVE; // << painting bug in Laz+Gtk2
+                else
+                  Result.State := GTK_STATE_NORMAL;
+                end;
+              end else
+                Result.State := GtkButtonMap[Details.State];
+
+              Result.IsHot := Details.State in [TS_HOT, TS_HOTCHECKED];
+              if Result.Style = nil then
+                Result.Style := GetStyle(lgsToolButton);
+              if (Details.Part = TP_SPLITBUTTONDROPDOWN) then
               begin
                 Result.Detail := 'arrow';
                 Result.ArrowType := GTK_ARROW_DOWN;
@@ -380,20 +403,6 @@ begin
               end
               else
               begin
-                Result.Widget := GetStyleWidget(lgsToolButton);
-                if Result.Style = nil then
-                  Result.Style := GetStyle(lgsToolButton);
-                Result.State := GtkButtonMap[Details.State];
-                if Details.State in [TS_PRESSED, TS_CHECKED, TS_HOTCHECKED] then
-                  Result.Shadow := GTK_SHADOW_IN
-                else
-                if Details.State in [TS_HOT] then
-                  Result.Shadow := GTK_SHADOW_ETCHED_OUT
-                else
-                  Result.Shadow := GTK_SHADOW_NONE;
-
-                Result.IsHot := Details.State in [TS_HOT, TS_HOTCHECKED];
-
                 Result.Detail := 'button';
                 if Result.Shadow = GTK_SHADOW_NONE then
                   Result.Painter := gptNone
@@ -551,8 +560,6 @@ begin
   else
   begin
     Result := 1;
-    if (Details.Element = teToolBar) and (Details.Part = TP_SPLITBUTTONDROPDOWN) then
-      inc(Result); // + Arrow
   end;
 end;