Mercurial > octave
view libgui/graphics/ContextMenu.h @ 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 | 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 (octave_ContextMenu_h) #define octave_ContextMenu_h 1 #include <QPoint> #include "MenuContainer.h" #include "Object.h" class QMenu; namespace octave { class base_qobject; class interpreter; } namespace QtHandles { class ContextMenu : public Object, public MenuContainer { Q_OBJECT public: ContextMenu (octave::base_qobject& oct_qobj, octave::interpreter& interp, const graphics_object& go, QMenu *menu); ~ContextMenu (void); static ContextMenu * create (octave::base_qobject& oct_qobj, octave::interpreter& interp, const graphics_object& go); static void executeAt (octave::interpreter& interp, const base_properties& props, const QPoint& pt); Container * innerContainer (void) { return nullptr; } QWidget * menu (void); protected: void update (int pId); private slots: void aboutToShow (void); void aboutToHide (void); }; } #endif