Mercurial > octave
diff libgui/graphics/BaseControl.cc @ 28248:aee0f20c8029
Implement "gray" when uicontrol radiobutton/checkbox are disabled (bug #57128)
* BaseControl.cc (updatePalette): Call setColor() with additional argument of
"QPalette::Active" and again with "QPalette::Inactive" so that colors are set
only for specific roles.
* CheckBoxControl.h (CheckBoxControl): Declare new private member function
update().
* CheckBoxControl.cc (CheckBoxControl): Check for "Enable" property value of
"inactive" and call setCheckable (false) if found.
* CheckBoxControl.cc (update): New function to intercept and handle change to
"Enable" property before forwarding to BaseControl.
* RadioButtonControl.cc (RadioButtonControl): Check for "Enable" property value
of "inactive" and call setCheckable (false) if found.
* RadioButtonControl.cc (update): New function to intercept and handle change
to "Enable" property before forwarding to BaseControl.
| author | Rik <rik@octave.org> |
|---|---|
| date | Sun, 26 Apr 2020 18:15:30 -0700 |
| parents | 20794455ea11 |
| children | be4a6f33d142 |
line wrap: on
line diff
--- a/libgui/graphics/BaseControl.cc Sun Apr 26 15:11:51 2020 -0700 +++ b/libgui/graphics/BaseControl.cc Sun Apr 26 18:15:30 2020 -0700 @@ -74,9 +74,13 @@ else if (props.style_is ("radiobutton") || props.style_is ("checkbox")) { - p.setColor (QPalette::Button, + p.setColor (QPalette::Active, QPalette::Button, + Utils::fromRgb (props.get_backgroundcolor_rgb ())); + p.setColor (QPalette::Inactive, QPalette::Button, Utils::fromRgb (props.get_backgroundcolor_rgb ())); - p.setColor (QPalette::WindowText, + p.setColor (QPalette::Active, QPalette::WindowText, + Utils::fromRgb (props.get_foregroundcolor_rgb ())); + p.setColor (QPalette::Inactive, QPalette::WindowText, Utils::fromRgb (props.get_foregroundcolor_rgb ())); } else if (props.style_is ("pushbutton")