# HG changeset patch
# User Rik <rik@octave.org>
# Date 1587066691 25200
# Node ID a56ee7986ea40e8eeafd4e4fecf93b20c5060bbb
# Parent  822dc79a7e9749a3475bf8ace56ca0185015bb06
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.

diff -r 822dc79a7e97 -r a56ee7986ea4 libgui/graphics/PushButtonControl.cc
--- 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)
diff -r 822dc79a7e97 -r a56ee7986ea4 libgui/graphics/ToggleButtonControl.cc
--- 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)