Mercurial > octave
view libgui/graphics/PushButtonControl.cc @ 28225:fbced93c9704 stable
Fix reversal of width and height in uicontrol icon creation (bug #58144).
* PushButtonControl.cc (PushButtonControl::PushButtonControl): Reverse order of
parameters in call to Utils::makeImageFromCData which expects order to be
width, height.
* ToggleButtonControl.cc (ToggleButtonControl::ToggleButtonControl): Reverse
order of parameters in call to Utils::makeImageFromCData which expects order to
be width, height.
author | Rik <rik@octave.org> |
---|---|
date | Thu, 16 Apr 2020 11:48:06 -0700 |
parents | bd51beb6205e |
children | a56ee7986ea4 0a5b15007766 |
line wrap: on
line source
//////////////////////////////////////////////////////////////////////// // // Copyright (C) 2011-2020 The Octave Project Developers // // See the file COPYRIGHT.md in the top-level directory of this // distribution or <https://octave.org/copyright/>. // // This file is part of Octave. // // Octave is free software: you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. // // Octave is distributed in the hope that it will be useful, but // WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. // // You should have received a copy of the GNU General Public License // along with Octave; see the file COPYING. If not, see // <https://www.gnu.org/licenses/>. // //////////////////////////////////////////////////////////////////////// #if defined (HAVE_CONFIG_H) # include "config.h" #endif #include <QPushButton> #include <QtDebug> #include "PushButtonControl.h" #include "Container.h" #include "QtHandlesUtils.h" #include "octave-qobject.h" namespace QtHandles { PushButtonControl* PushButtonControl::create (octave::base_qobject& oct_qobj, octave::interpreter& interp, const graphics_object& go) { Object *parent = parentObject (interp, go); if (parent) { Container *container = parent->innerContainer (); if (container) return new PushButtonControl (oct_qobj, interp, go, new QPushButton (container)); } return nullptr; } PushButtonControl::PushButtonControl (octave::base_qobject& oct_qobj, octave::interpreter& interp, const graphics_object& go, QPushButton *btn) : ButtonControl (oct_qobj, interp, go, btn) { uicontrol::properties& up = properties<uicontrol> (); btn->setAutoFillBackground (true); octave_value cdat = up.get_cdata (); QImage img = Utils::makeImageFromCData (cdat, cdat.columns (), cdat.rows ()); btn->setIcon (QIcon (QPixmap::fromImage (img))); } PushButtonControl::~PushButtonControl (void) { } void PushButtonControl::update (int pId) { uicontrol::properties& up = properties<uicontrol> (); QPushButton *btn = qWidget<QPushButton> (); switch (pId) { case uicontrol::properties::ID_CDATA: { octave_value cdat = up.get_cdata (); QImage img = Utils::makeImageFromCData (cdat, cdat.rows (), cdat.columns ()); btn->setIcon (QIcon (QPixmap::fromImage (img))); } break; default: ButtonControl::update (pId); break; } } }