Mercurial > octave
view libgui/graphics/ToolBarButton.cc @ 28233:9a40d2b40db8
Scale ToolBarButton icons to 24x24 for better appearance (bug #58144).
* ToolBarButton.cc (ToolBarButton, update): Call Utils::makeImageFromCData with
width and height of 24, rather than 32.
author | Rik <rik@octave.org> |
---|---|
date | Tue, 21 Apr 2020 17:06:35 -0700 |
parents | bd51beb6205e |
children | 7854d5752dd2 |
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/>. // //////////////////////////////////////////////////////////////////////// // This file should not include config.h. It is only included in other // C++ source files that should have included config.h before including // this file. #include <QAction> #include <QIcon> #include <QWidget> #include "ToolBarButton.h" #include "QtHandlesUtils.h" #include "octave-qobject.h" namespace QtHandles { template <typename T> ToolBarButton<T>::ToolBarButton (octave::base_qobject& oct_qobj, octave::interpreter& interp, const graphics_object& go, QAction *action) : Object (oct_qobj, interp, go, action), m_separator (nullptr) { typename T::properties& tp = properties<T> (); action->setToolTip (Utils::fromStdString (tp.get_tooltipstring ())); action->setVisible (tp.is_visible ()); // Get the icon data from cdata or as a named icon QImage img = Utils::makeImageFromCData (tp.get_cdata (), 24, 24); if (img.width () == 0) { QIcon ico; std::string name = tp.get___named_icon__ (); if (! name.empty ()) ico = get_icon (name); action->setIcon (ico); } else action->setIcon (QIcon (QPixmap::fromImage (img))); if (tp.is_separator ()) { m_separator = new QAction (action); m_separator->setSeparator (true); m_separator->setVisible (tp.is_visible ()); } action->setEnabled (tp.is_enable ()); QWidget *w = qobject_cast<QWidget *> (action->parent ()); w->insertAction (w->actions ().back (), action); if (m_separator) w->insertAction (action, m_separator); } template <typename T> ToolBarButton<T>::~ToolBarButton (void) { } template <typename T> void ToolBarButton<T>::update (int pId) { typename T::properties& tp = properties<T> (); QAction *action = qWidget<QAction> (); switch (pId) { case base_properties::ID_VISIBLE: action->setVisible (tp.is_visible ()); if (m_separator) m_separator->setVisible (tp.is_visible ()); break; case T::properties::ID_TOOLTIPSTRING: action->setToolTip (Utils::fromStdString (tp.get_tooltipstring ())); break; case T::properties::ID_CDATA: { // Get the icon data from cdata or as a named icon QImage img = Utils::makeImageFromCData (tp.get_cdata (), 24, 24); if (img.width () == 0) { QIcon ico; std::string name = tp.get___named_icon__ (); if (! name.empty ()) ico = get_icon (name); action->setIcon (ico); } else action->setIcon (QIcon (QPixmap::fromImage (img))); } break; case T::properties::ID_SEPARATOR: if (tp.is_separator ()) { if (! m_separator) { m_separator = new QAction (action); m_separator->setSeparator (true); m_separator->setVisible (tp.is_visible ()); QWidget *w = qobject_cast<QWidget *> (action->parent ()); w->insertAction (action, m_separator); } } else { if (m_separator) delete m_separator; m_separator = nullptr; } break; case T::properties::ID_ENABLE: action->setEnabled (tp.is_enable ()); break; default: Object::update (pId); break; } } template <typename T> QIcon ToolBarButton<T>::get_icon (const std::string& name) { octave::resource_manager& rmgr = m_octave_qobj.get_resource_manager (); return rmgr.icon (QString::fromStdString (name)); } }