Mercurial > octave
view libgui/graphics/PushButtonControl.cc @ 26225:1a12d4369beb
Fix "Value" property for uicontrol togglebuttons (bug #55211).
Also fix "string" property for uicontrol pushbuttons.
* ToggleButtonControl.cc (update): If property is not handled by ToggleButton
update() function then forward event to ButtonControl::update.
* PushButtonControl.cc (update): Remove handling of "string" property.
If property is not handled by PushButton update() function then forward event
to ButtonControl::update.
author | Rik <rik@octave.org> |
---|---|
date | Thu, 13 Dec 2018 11:57:39 -0800 |
parents | 88e87c69c8b8 |
children | 00f796120a6d |
line wrap: on
line source
/* Copyright (C) 2011-2018 Michael Goffioul 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" namespace QtHandles { PushButtonControl* PushButtonControl::create (const graphics_object& go) { Object *parent = Object::parentObject (go); if (parent) { Container *container = parent->innerContainer (); if (container) return new PushButtonControl (go, new QPushButton (container)); } return nullptr; } PushButtonControl::PushButtonControl (const graphics_object& go, QPushButton *btn) : ButtonControl (go, btn) { uicontrol::properties& up = properties<uicontrol> (); btn->setAutoFillBackground (true); octave_value cdat = up.get_cdata (); QImage img = Utils::makeImageFromCData (cdat, cdat.rows (), cdat.columns ()); 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; } } }