diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-05-13 14:46:22 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-05-13 14:46:25 +0100 |
| commit | ccfab82ebd35771163d782da6b3737127a8ad589 (patch) | |
| tree | 468740a2120ef36ab97ef01f63f88765feaed894 /vcl | |
| parent | 85eb28ccb72b97f253418a925fe54fa6bc124d01 (diff) | |
gtk3: if we have GTK_STATE_FLAG_CHECKED use only that bit
in order to get insensitive checkmarks painted gray
Change-Id: I29016b8c5f08c74934068bb06ae2c76ca2cb01c7
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx index 14f75c750d1a..37b00b1177a9 100644 --- a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx +++ b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx @@ -790,9 +790,9 @@ void GtkSalGraphics::PaintCheckOrRadio(GtkStyleContext *context, } #if GTK_CHECK_VERSION(3,14,0) -# define CHECKED_AND_ACTIVE (GTK_STATE_FLAG_CHECKED | GTK_STATE_FLAG_ACTIVE) +# define CHECKED GTK_STATE_FLAG_CHECKED #else -# define CHECKED_AND_ACTIVE GTK_STATE_FLAG_ACTIVE +# define CHECKED GTK_STATE_FLAG_ACTIVE #endif bool GtkSalGraphics::drawNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, @@ -889,7 +889,7 @@ bool GtkSalGraphics::drawNativeControl( ControlType nType, ControlPart nPart, co break; case CTRL_CHECKBOX: flags = (GtkStateFlags)(flags | - ( (rValue.getTristateVal() == BUTTONVALUE_ON) ? CHECKED_AND_ACTIVE : + ( (rValue.getTristateVal() == BUTTONVALUE_ON) ? CHECKED : (rValue.getTristateVal() == BUTTONVALUE_MIXED) ? GTK_STATE_FLAG_INCONSISTENT : GTK_STATE_FLAG_NORMAL)); context = mpCheckButtonStyle; @@ -898,7 +898,7 @@ bool GtkSalGraphics::drawNativeControl( ControlType nType, ControlPart nPart, co break; case CTRL_RADIOBUTTON: flags = (GtkStateFlags)(flags | - ( (rValue.getTristateVal() == BUTTONVALUE_ON) ? CHECKED_AND_ACTIVE : GTK_STATE_FLAG_NORMAL)); + ( (rValue.getTristateVal() == BUTTONVALUE_ON) ? CHECKED : GTK_STATE_FLAG_NORMAL)); context = mpCheckButtonStyle; styleClass = GTK_STYLE_CLASS_RADIO; renderType = RENDER_RADIO; |