Skip to content

Commit 13c3eaa

Browse files
committed
Implement 476f991 from Geballin/gtkTtk
1 parent 5747628 commit 13c3eaa

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

generic/gttk_Entry.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,8 @@ static void EntryFieldElementDraw(
7070
GTTK_STYLE_FROM_WIDGET;
7171
gttk_StateShadowTableLookup(NULL, state, gtkState, gtkShadow,
7272
GTTK_SECTION_ENTRY|GTTK_SECTION_ALL);
73+
gttk_gtk_paint_flat_box(style, gdkDrawable, gtkState, gtkShadow, NULL, widget,
74+
"entry_bg", 0, 0, b.width, b.height);
7375
GTTK_WIDGET_SET_FOCUS(widget);
7476
gttk_gtk_paint_shadow(style, gdkDrawable, gtkState, gtkShadow, NULL,
7577
widget, "entry", 0, 0, b.width, b.height);

generic/gttk_Utilities.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -458,11 +458,13 @@ unsigned int gttk_StateShadowTableLookup(gttk_StateTable *map,
458458
gtkShadow = GTK_SHADOW_IN;
459459
} else {
460460
gtkShadow = GTK_SHADOW_OUT;
461-
// if (state & TTK_STATE_DISABLED || state & TTK_STATE_READONLY)
462-
// gtkState = GTK_STATE_INSENSITIVE;
461+
if (state & TTK_STATE_DISABLED || state & TTK_STATE_READONLY)
462+
gtkState = GTK_STATE_INSENSITIVE;
463463
// else if (state & TTK_STATE_ACTIVE) gtkState = GTK_STATE_PRELIGHT;
464464
// else if (state & TTK_STATE_FOCUS) gtkState = GTK_STATE_ACTIVE;
465465
}
466+
if ((section & GTTK_SECTION_ENTRY) && (state & TTK_STATE_FOCUS))
467+
gtkState = GTK_STATE_ACTIVE;
466468
if ((state & TTK_STATE_ACTIVE) &&
467469
(!(state & TTK_STATE_PRESSED) && !(state & TTK_STATE_SELECTED))) {
468470
gtkState = GTK_STATE_PRELIGHT;

0 commit comments

Comments
 (0)