Mercurial > octave

diff libgui/graphics/BaseControl.cc @ 22411:c69805d1fa64

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Style check C++ code in libgui/ * Backend.cc, Backend.h, BaseControl.cc, BaseControl.h, ButtonControl.cc, ButtonControl.h, ButtonGroup.cc, ButtonGroup.h, Canvas.cc, Canvas.h, CheckBoxControl.cc, CheckBoxControl.h, Container.cc, Container.h, ContextMenu.cc, ContextMenu.h, EditControl.cc, EditControl.h, Figure.cc, Figure.h, FigureWindow.cc, FigureWindow.h, GLCanvas.cc, GLCanvas.h, GenericEventNotify.h, KeyMap.cc, KeyMap.h, ListBoxControl.cc, ListBoxControl.h, Logger.cc, Logger.h, Menu.cc, Menu.h, MenuContainer.h, MouseModeActionGroup.cc, MouseModeActionGroup.h, Object.cc, Object.h, ObjectFactory.cc, ObjectFactory.h, ObjectProxy.cc, ObjectProxy.h, Panel.cc, Panel.h, PopupMenuControl.cc, PopupMenuControl.h, PushButtonControl.cc, PushButtonControl.h, PushTool.cc, PushTool.h, QtHandlesUtils.cc, QtHandlesUtils.h, RadioButtonControl.cc, RadioButtonControl.h, SliderControl.cc, SliderControl.h, TextControl.cc, TextControl.h, TextEdit.cc, TextEdit.h, ToggleButtonControl.cc, ToggleButtonControl.h, ToggleTool.cc, ToggleTool.h, ToolBar.cc, ToolBar.h, ToolBarButton.cc, ToolBarButton.h, __init_qt__.cc, __init_qt__.h, annotation-dialog.cc, annotation-dialog.h, gl-select.cc, gl-select.h, color-picker.cc, color-picker.h, dialog.h, documentation-dock-widget.cc, documentation-dock-widget.h, files-dock-widget.cc, files-dock-widget.h, find-files-dialog.h, find-files-model.cc, find-files-model.h, history-dock-widget.cc, history-dock-widget.h, liboctgui-build-info.h, liboctgui-build-info.in.cc, file-editor-interface.h, file-editor-tab.cc, file-editor-tab.h, file-editor.cc, file-editor.h, find-dialog.cc, find-dialog.h, marker.cc, marker.h, octave-qscintilla.cc, octave-qscintilla.h, octave-txt-lexer.cc, octave-txt-lexer.h, main-window.cc, main-window.h, octave-cmd.cc, octave-cmd.h, octave-dock-widget.cc, octave-dock-widget.h, octave-gui.cc, octave-gui.h, octave-interpreter.cc, octave-interpreter.h, octave-qt-link.cc, octave-qt-link.h, parser.cc, parser.h, webinfo.cc, webinfo.h, resource-manager.cc, resource-manager.h, settings-dialog.cc, settings-dialog.h, shortcut-manager.cc, shortcut-manager.h, terminal-dock-widget.h, thread-manager.cc, thread-manager.h, welcome-wizard.cc, welcome-wizard.h, workspace-model.cc, workspace-model.h, workspace-view.cc, workspace-view.h: Style check C++ code in libgui/
author Rik <rik@octave.org>
date Wed, 31 Aug 2016 12:20:46 -0700
parents bac0d6f07a3e
children 8758addcf265
line wrap: on
line diff
--- a/libgui/graphics/BaseControl.cc	Wed Aug 31 14:37:33 2016 -0400
+++ b/libgui/graphics/BaseControl.cc	Wed Aug 31 12:20:46 2016 -0700
@@ -36,214 +36,215 @@
 namespace QtHandles
 {
 
-static void
-updatePalette (const uicontrol::properties& props, QWidget* w)
-{
-  QPalette p = w->palette ();
+  static void
+  updatePalette (const uicontrol::properties& props, QWidget* w)
+  {
+    QPalette p = w->palette ();
 
-  if (props.style_is ("edit")
-      || props.style_is ("listbox")
-      || props.style_is ("popupmenu"))
-    {
-      p.setColor (QPalette::Base,
-                  Utils::fromRgb (props.get_backgroundcolor_rgb ()));
-      p.setColor (QPalette::Text,
-                  Utils::fromRgb (props.get_foregroundcolor_rgb ()));
-    }
-  else if (props.style_is ("pushbutton")
-           || props.style_is ("togglebutton"))
-    {
-      p.setColor (QPalette::Button,
-                  Utils::fromRgb (props.get_backgroundcolor_rgb ()));
-      p.setColor (QPalette::ButtonText,
-                  Utils::fromRgb (props.get_foregroundcolor_rgb ()));
-    }
-  else
-    {
-      p.setColor (QPalette::Window,
-                  Utils::fromRgb (props.get_backgroundcolor_rgb ()));
-      p.setColor (QPalette::WindowText,
-                  Utils::fromRgb (props.get_foregroundcolor_rgb ()));
-    }
+    if (props.style_is ("edit")
+        || props.style_is ("listbox")
+        || props.style_is ("popupmenu"))
+      {
+        p.setColor (QPalette::Base,
+                    Utils::fromRgb (props.get_backgroundcolor_rgb ()));
+        p.setColor (QPalette::Text,
+                    Utils::fromRgb (props.get_foregroundcolor_rgb ()));
+      }
+    else if (props.style_is ("pushbutton")
+             || props.style_is ("togglebutton"))
+      {
+        p.setColor (QPalette::Button,
+                    Utils::fromRgb (props.get_backgroundcolor_rgb ()));
+        p.setColor (QPalette::ButtonText,
+                    Utils::fromRgb (props.get_foregroundcolor_rgb ()));
+      }
+    else
+      {
+        p.setColor (QPalette::Window,
+                    Utils::fromRgb (props.get_backgroundcolor_rgb ()));
+        p.setColor (QPalette::WindowText,
+                    Utils::fromRgb (props.get_foregroundcolor_rgb ()));
+      }
 
-  w->setPalette (p);
-}
+    w->setPalette (p);
+  }
 
-BaseControl::BaseControl (const graphics_object& go, QWidget* w)
-  : Object (go, w), m_normalizedFont (false), m_keyPressHandlerDefined (false)
-{
-  init (w);
-}
+  BaseControl::BaseControl (const graphics_object& go, QWidget* w)
+    : Object (go, w), m_normalizedFont (false), m_keyPressHandlerDefined (false)
+  {
+    init (w);
+  }
 
-void
-BaseControl::init (QWidget* w, bool callBase)
-{
-  if (callBase)
-    Object::init (w, callBase);
+  void
+  BaseControl::init (QWidget* w, bool callBase)
+  {
+    if (callBase)
+      Object::init (w, callBase);
 
-  uicontrol::properties& up = properties<uicontrol> ();
+    uicontrol::properties& up = properties<uicontrol> ();
 
-  Matrix bb = up.get_boundingbox (false);
-  w->setGeometry (octave::math::round (bb(0)), octave::math::round (bb(1)),
-                  octave::math::round (bb(2)), octave::math::round (bb(3)));
-  w->setFont (Utils::computeFont<uicontrol> (up, bb(3)));
-  updatePalette (up, w);
-  w->setEnabled (up.enable_is ("on"));
-  w->setToolTip (Utils::fromStdString (up.get_tooltipstring ()));
-  w->setVisible (up.is_visible ());
-  m_keyPressHandlerDefined = ! up.get_keypressfcn ().is_empty ();
+    Matrix bb = up.get_boundingbox (false);
+    w->setGeometry (octave::math::round (bb(0)), octave::math::round (bb(1)),
+                    octave::math::round (bb(2)), octave::math::round (bb(3)));
+    w->setFont (Utils::computeFont<uicontrol> (up, bb(3)));
+    updatePalette (up, w);
+    w->setEnabled (up.enable_is ("on"));
+    w->setToolTip (Utils::fromStdString (up.get_tooltipstring ()));
+    w->setVisible (up.is_visible ());
+    m_keyPressHandlerDefined = ! up.get_keypressfcn ().is_empty ();
 
-  w->installEventFilter (this);
+    w->installEventFilter (this);
 
-  m_normalizedFont = up.fontunits_is ("normalized");
-}
+    m_normalizedFont = up.fontunits_is ("normalized");
+  }
 
-BaseControl::~BaseControl (void)
-{
-}
+  BaseControl::~BaseControl (void)
+  {
+  }
 
-void
-BaseControl::update (int pId)
-{
-  uicontrol::properties& up = properties<uicontrol> ();
-  QWidget* w = qWidget<QWidget> ();
+  void
+  BaseControl::update (int pId)
+  {
+    uicontrol::properties& up = properties<uicontrol> ();
+    QWidget* w = qWidget<QWidget> ();
 
-   switch (pId)
-    {
-    case uicontrol::properties::ID_POSITION:
+    switch (pId)
+      {
+      case uicontrol::properties::ID_POSITION:
         {
           Matrix bb = up.get_boundingbox (false);
           w->setGeometry (octave::math::round (bb(0)), octave::math::round (bb(1)),
                           octave::math::round (bb(2)), octave::math::round (bb(3)));
         }
-      break;
-
-    case uicontrol::properties::ID_FONTNAME:
-    case uicontrol::properties::ID_FONTSIZE:
-    case uicontrol::properties::ID_FONTWEIGHT:
-    case uicontrol::properties::ID_FONTANGLE:
-      w->setFont (Utils::computeFont<uicontrol> (up));
-      break;
+        break;
 
-    case uicontrol::properties::ID_FONTUNITS:
-      // FIXME: We shouldn't have to do anything, octave should update
-      //        the "fontsize" property automatically to the new units.
-      //        Hence the actual font used shouldn't change.
-      m_normalizedFont = up.fontunits_is ("normalized");
-      break;
-
-    case uicontrol::properties::ID_BACKGROUNDCOLOR:
-    case uicontrol::properties::ID_FOREGROUNDCOLOR:
-      updatePalette (up, w);
-      break;
+      case uicontrol::properties::ID_FONTNAME:
+      case uicontrol::properties::ID_FONTSIZE:
+      case uicontrol::properties::ID_FONTWEIGHT:
+      case uicontrol::properties::ID_FONTANGLE:
+        w->setFont (Utils::computeFont<uicontrol> (up));
+        break;
 
-    case uicontrol::properties::ID_ENABLE:
-      w->setEnabled (up.enable_is ("on"));
-      break;
-
-    case uicontrol::properties::ID_TOOLTIPSTRING:
-      w->setToolTip (Utils::fromStdString (up.get_tooltipstring ()));
-      break;
+      case uicontrol::properties::ID_FONTUNITS:
+        // FIXME: We shouldn't have to do anything, octave should update
+        //        the "fontsize" property automatically to the new units.
+        //        Hence the actual font used shouldn't change.
+        m_normalizedFont = up.fontunits_is ("normalized");
+        break;
 
-    case base_properties::ID_VISIBLE:
-      w->setVisible (up.is_visible ());
-      break;
+      case uicontrol::properties::ID_BACKGROUNDCOLOR:
+      case uicontrol::properties::ID_FOREGROUNDCOLOR:
+        updatePalette (up, w);
+        break;
 
-    case uicontrol::properties::ID_KEYPRESSFCN:
-      m_keyPressHandlerDefined = ! up.get_keypressfcn ().is_empty ();
-      break;
+      case uicontrol::properties::ID_ENABLE:
+        w->setEnabled (up.enable_is ("on"));
+        break;
 
-    default:
-      break;
-    }
-}
+      case uicontrol::properties::ID_TOOLTIPSTRING:
+        w->setToolTip (Utils::fromStdString (up.get_tooltipstring ()));
+        break;
 
-bool
-BaseControl::eventFilter (QObject* watched, QEvent* xevent)
-{
-  switch (xevent->type ())
-    {
-    case QEvent::Resize:
-      if (m_normalizedFont)
-        {
-          gh_manager::auto_lock lock;
+      case base_properties::ID_VISIBLE:
+        w->setVisible (up.is_visible ());
+        break;
+
+      case uicontrol::properties::ID_KEYPRESSFCN:
+        m_keyPressHandlerDefined = ! up.get_keypressfcn ().is_empty ();
+        break;
 
-          qWidget<QWidget> ()->setFont (Utils::computeFont<uicontrol>
-                                        (properties<uicontrol> ()));
-        }
-      break;
+      default:
+        break;
+      }
+  }
 
-    case QEvent::MouseButtonPress:
+  bool
+  BaseControl::eventFilter (QObject* watched, QEvent* xevent)
+  {
+    switch (xevent->type ())
       {
-        gh_manager::auto_lock lock;
-
-        QMouseEvent* m = dynamic_cast<QMouseEvent*> (xevent);
-        graphics_object go = object ();
-        uicontrol::properties& up = Utils::properties<uicontrol> (go);
-        graphics_object fig = go.get_ancestor ("figure");
-
-        if (m->button () != Qt::LeftButton
-            || ! up.enable_is ("on"))
+      case QEvent::Resize:
+        if (m_normalizedFont)
           {
-            gh_manager::post_set (fig.get_handle (), "selectiontype",
-                                  Utils::figureSelectionType (m), false);
-            gh_manager::post_set (fig.get_handle (), "currentpoint",
-                                  Utils::figureCurrentPoint (fig, m),
-                                  false);
-            gh_manager::post_callback (fig.get_handle (),
-                                       "windowbuttondownfcn");
-            gh_manager::post_callback (m_handle, "buttondownfcn");
+            gh_manager::auto_lock lock;
 
-            if (m->button () == Qt::RightButton)
-              ContextMenu::executeAt (up, m->globalPos ());
+            qWidget<QWidget> ()->setFont (Utils::computeFont<uicontrol>
+                                          (properties<uicontrol> ()));
           }
-        else
-          {
-            if (up.style_is ("listbox"))
-              gh_manager::post_set (fig.get_handle (), "selectiontype",
-                                    Utils::figureSelectionType (m), false);
-            else
-              gh_manager::post_set (fig.get_handle (), "selectiontype",
-                                    octave_value ("normal"), false);
-          }
-      }
-      break;
+        break;
 
-    case QEvent::MouseMove:
-      if (qWidget<QWidget> ()->hasMouseTracking ())
+      case QEvent::MouseButtonPress:
         {
           gh_manager::auto_lock lock;
 
           QMouseEvent* m = dynamic_cast<QMouseEvent*> (xevent);
           graphics_object go = object ();
+          uicontrol::properties& up = Utils::properties<uicontrol> (go);
           graphics_object fig = go.get_ancestor ("figure");
 
-          gh_manager::post_set (fig.get_handle (), "currentpoint",
-                                Utils::figureCurrentPoint (fig, m), false);
-          gh_manager::post_callback (fig.get_handle (), "windowbuttonmotionfcn");
+          if (m->button () != Qt::LeftButton
+              || ! up.enable_is ("on"))
+            {
+              gh_manager::post_set (fig.get_handle (), "selectiontype",
+                                    Utils::figureSelectionType (m), false);
+              gh_manager::post_set (fig.get_handle (), "currentpoint",
+                                    Utils::figureCurrentPoint (fig, m),
+                                    false);
+              gh_manager::post_callback (fig.get_handle (),
+                                         "windowbuttondownfcn");
+              gh_manager::post_callback (m_handle, "buttondownfcn");
+
+              if (m->button () == Qt::RightButton)
+                ContextMenu::executeAt (up, m->globalPos ());
+            }
+          else
+            {
+              if (up.style_is ("listbox"))
+                gh_manager::post_set (fig.get_handle (), "selectiontype",
+                                      Utils::figureSelectionType (m), false);
+              else
+                gh_manager::post_set (fig.get_handle (), "selectiontype",
+                                      octave_value ("normal"), false);
+            }
         }
-      break;
+        break;
 
-    case QEvent::KeyPress:
-      if (m_keyPressHandlerDefined)
-        {
-          gh_manager::auto_lock lock;
+      case QEvent::MouseMove:
+        if (qWidget<QWidget> ()->hasMouseTracking ())
+          {
+            gh_manager::auto_lock lock;
 
-          octave_scalar_map keyData =
-            Utils::makeKeyEventStruct (dynamic_cast<QKeyEvent*> (xevent));
-          graphics_object fig = object ().get_ancestor ("figure");
+            QMouseEvent* m = dynamic_cast<QMouseEvent*> (xevent);
+            graphics_object go = object ();
+            graphics_object fig = go.get_ancestor ("figure");
+
+            gh_manager::post_set (fig.get_handle (), "currentpoint",
+                                  Utils::figureCurrentPoint (fig, m), false);
+            gh_manager::post_callback (fig.get_handle (), "windowbuttonmotionfcn");
+          }
+        break;
+
+      case QEvent::KeyPress:
+        if (m_keyPressHandlerDefined)
+          {
+            gh_manager::auto_lock lock;
 
-          gh_manager::post_set (fig.get_handle (), "currentcharacter",
-                                keyData.getfield ("Character"), false);
-          gh_manager::post_callback (m_handle, "keypressfcn", keyData);
-        }
-      break;
+            octave_scalar_map keyData =
+              Utils::makeKeyEventStruct (dynamic_cast<QKeyEvent*> (xevent));
+            graphics_object fig = object ().get_ancestor ("figure");
 
-    default:
-      break;
-    }
+            gh_manager::post_set (fig.get_handle (), "currentcharacter",
+                                  keyData.getfield ("Character"), false);
+            gh_manager::post_callback (m_handle, "keypressfcn", keyData);
+          }
+        break;
 
-  return Object::eventFilter (watched, xevent);
-}
+      default:
+        break;
+      }
+
+    return Object::eventFilter (watched, xevent);
+  }
 
 }; // namespace QtHandles
+