Implement 476f991 from Geballin/gtkTtk

RedFantom · RedFantom · commit 13c3eaa7ab69 · 2020-09-21T16:18:15.000+02:00
diff --git a/generic/gttk_Entry.cpp b/generic/gttk_Entry.cpp
@@ -70,6 +70,8 @@ static void EntryFieldElementDraw(
       GTTK_STYLE_FROM_WIDGET;
       gttk_StateShadowTableLookup(NULL, state, gtkState, gtkShadow,
               GTTK_SECTION_ENTRY|GTTK_SECTION_ALL);
+      gttk_gtk_paint_flat_box(style, gdkDrawable, gtkState, gtkShadow, NULL, widget,
+          "entry_bg", 0, 0, b.width, b.height);
       GTTK_WIDGET_SET_FOCUS(widget);
       gttk_gtk_paint_shadow(style, gdkDrawable, gtkState, gtkShadow, NULL,
               widget, "entry", 0, 0, b.width, b.height);
diff --git a/generic/gttk_Utilities.cpp b/generic/gttk_Utilities.cpp
@@ -458,11 +458,13 @@ unsigned int gttk_StateShadowTableLookup(gttk_StateTable *map,
         gtkShadow = GTK_SHADOW_IN;
       } else {
         gtkShadow = GTK_SHADOW_OUT;
-        // if (state & TTK_STATE_DISABLED || state & TTK_STATE_READONLY)
-        //                                    gtkState  = GTK_STATE_INSENSITIVE;
+        if (state & TTK_STATE_DISABLED || state & TTK_STATE_READONLY)
+            gtkState  = GTK_STATE_INSENSITIVE;
         // else if (state & TTK_STATE_ACTIVE) gtkState  = GTK_STATE_PRELIGHT;
         // else if (state & TTK_STATE_FOCUS)  gtkState  = GTK_STATE_ACTIVE;
       }
+      if ((section & GTTK_SECTION_ENTRY) && (state & TTK_STATE_FOCUS))
+        gtkState = GTK_STATE_ACTIVE;
       if ((state & TTK_STATE_ACTIVE) &&
              (!(state & TTK_STATE_PRESSED) && !(state & TTK_STATE_SELECTED))) {
         gtkState = GTK_STATE_PRELIGHT;
