Mercurial > octave
changeset 28227:a56ee7986ea4
Use size from 'CData' property of uicontrol to set icon size of buttons (bug #58144).
* PushButtonControl.cc (PushButtonControl::PushButtonControl): Call
setIconSize to set correct size.
* ToggleButtonControl.cc (ToggleButtonControl::ToggleButtonControl): Call
setIconSize to set correct size.
author | Rik <rik@octave.org> |
---|---|
date | Thu, 16 Apr 2020 12:51:31 -0700 |
parents | 822dc79a7e97 |
children | f3f29e1801fc |
files | libgui/graphics/PushButtonControl.cc libgui/graphics/ToggleButtonControl.cc |
diffstat | 2 files changed, 2 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/libgui/graphics/PushButtonControl.cc Thu Apr 16 11:52:11 2020 -0700 +++ b/libgui/graphics/PushButtonControl.cc Thu Apr 16 12:51:31 2020 -0700 @@ -71,6 +71,7 @@ QImage img = Utils::makeImageFromCData (cdat, cdat.columns (), cdat.rows ()); btn->setIcon (QIcon (QPixmap::fromImage (img))); + btn->setIconSize (QSize (cdat.columns (), cdat.rows ())); } PushButtonControl::~PushButtonControl (void)
--- a/libgui/graphics/ToggleButtonControl.cc Thu Apr 16 11:52:11 2020 -0700 +++ b/libgui/graphics/ToggleButtonControl.cc Thu Apr 16 12:51:31 2020 -0700 @@ -77,6 +77,7 @@ QImage img = Utils::makeImageFromCData (cdat, cdat.columns (), cdat.rows ()); btn->setIcon (QIcon (QPixmap::fromImage (img))); + btn->setIconSize (QSize (cdat.columns (), cdat.rows ())); } ToggleButtonControl::~ToggleButtonControl (void)