octave: libgui/graphics/Figure.cc annotate

annotate libgui/graphics/Figure.cc @ 33359:689d4d069bbf

maint: Use Octave coding convention of space between function name and parentheses in libgui/. * libgui/graphics/BaseControl.cc, libgui/graphics/Canvas.cc, libgui/graphics/Figure.cc, libgui/graphics/FigureWindow.cc, libgui/graphics/FigureWindow.h, libgui/graphics/QtHandlesUtils.cc, libgui/graphics/Table.h, libgui/graphics/annotation-dialog.cc, libgui/graphics/gl-select.cc, libgui/src/command-widget.cc, libgui/src/dialog.cc, libgui/src/documentation-bookmarks.cc, libgui/src/documentation.cc, libgui/src/dw-main-window.cc, libgui/src/files-dock-widget.cc, libgui/src/gui-settings.cc, libgui/src/gui-settings.h, libgui/src/gui-utils.cc, libgui/src/led-indicator.cc, libgui/src/m-editor/file-editor-tab.cc, libgui/src/m-editor/find-dialog.cc, libgui/src/m-editor/octave-qscintilla.cc, libgui/src/main-window.cc, libgui/src/main-window.h, libgui/src/octave-dock-widget.cc, libgui/src/set-path-dialog.cc, libgui/src/set-path-model.cc, libgui/src/settings-dialog.cc, libgui/src/tab-bar.cc, libgui/src/tab-bar.h, libgui/src/terminal-dock-widget.cc, libgui/src/variable-editor-model.cc, libgui/src/variable-editor-model.h, libgui/src/variable-editor.cc, libgui/src/workspace-model.h, libgui/src/workspace-view.cc: Use Octave coding convention of space between function name and parentheses.

author	Rik <rik@octave.org>
date	Mon, 08 Apr 2024 14:39:40 -0700
parents	775dde0cb3e5
children	d7e4a4e1a8fb

rev	line source
27923 bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	1 ////////////////////////////////////////////////////////////////////////
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	2 //
32632 2e484f9f1f18 maint: update Octave Project Developers copyright for the new year John W. Eaton <jwe@octave.org> parents: 31808 diff changeset	3 // Copyright (C) 2011-2024 The Octave Project Developers
27923 bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	4 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	5 // See the file COPYRIGHT.md in the top-level directory of this
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	6 // distribution or <https://octave.org/copyright/>.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	7 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	8 // This file is part of Octave.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	9 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	10 // Octave is free software: you can redistribute it and/or modify it
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	11 // under the terms of the GNU General Public License as published by
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	12 // the Free Software Foundation, either version 3 of the License, or
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	13 // (at your option) any later version.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	14 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	15 // Octave is distributed in the hope that it will be useful, but
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	16 // WITHOUT ANY WARRANTY; without even the implied warranty of
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	17 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	18 // GNU General Public License for more details.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	19 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	20 // You should have received a copy of the GNU General Public License
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	21 // along with Octave; see the file COPYING. If not, see
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	22 // <https://www.gnu.org/licenses/>.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	23 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	24 ////////////////////////////////////////////////////////////////////////
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	25
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21662 diff changeset	26 #if defined (HAVE_CONFIG_H)
21301 40de9f8f23a6 Use '#include "config.h"' rather than <config.h>. Rik <rik@octave.org> parents: 21203 diff changeset	27 # include "config.h"
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	28 #endif
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	29
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	30 #include <QAction>
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	31 #include <QActionEvent>
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	32 #include <QApplication>
20079 27c0285828f8 make copying images to the clipboard work with Qt graphics John W. Eaton <jwe@octave.org> parents: 20078 diff changeset	33 #include <QClipboard>
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	34 #include <QEvent>
19685 7335cc071ab0 make save and saveas menu items work in Qt figure window John W. Eaton <jwe@octave.org> parents: 19681 diff changeset	35 #include <QFileDialog>
7335cc071ab0 make save and saveas menu items work in Qt figure window John W. Eaton <jwe@octave.org> parents: 19681 diff changeset	36 #include <QFileInfo>
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	37 #include <QFrame>
20079 27c0285828f8 make copying images to the clipboard work with Qt graphics John W. Eaton <jwe@octave.org> parents: 20078 diff changeset	38 #include <QImage>
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	39 #include <QMainWindow>
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	40 #include <QMenu>
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	41 #include <QMenuBar>
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	42 #include <QMessageBox>
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	43 #include <QtDebug>
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	44 #include <QTimer>
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	45 #include <QToolBar>
31745 6973fe71f6c5 assume QScreen::devicePixelRatio is available John W. Eaton <jwe@octave.org> parents: 31707 diff changeset	46 #include <QWindow>
6973fe71f6c5 assume QScreen::devicePixelRatio is available John W. Eaton <jwe@octave.org> parents: 31707 diff changeset	47 #include <QScreen>
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	48
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	49 #include "Canvas.h"
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	50 #include "Container.h"
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	51 #include "Figure.h"
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	52 #include "FigureWindow.h"
18505 fb96b7f55242 rename file to avoid clash on case-insenstive filesystems (bug #41658) John W. Eaton <jwe@octave.org> parents: 18501 diff changeset	53 #include "QtHandlesUtils.h"
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	54
27560 3fcc650de22f split gui-preferences.h into one file per widget John W. Eaton <jwe@octave.org> parents: 27478 diff changeset	55 #include "gui-preferences-global.h"
27417 f844b1f03dcc update some header file lists in libgui sources John W. Eaton <jwe@octave.org> parents: 27376 diff changeset	56 #include "qt-interpreter-events.h"
f844b1f03dcc update some header file lists in libgui sources John W. Eaton <jwe@octave.org> parents: 27376 diff changeset	57
20079 27c0285828f8 make copying images to the clipboard work with Qt graphics John W. Eaton <jwe@octave.org> parents: 20078 diff changeset	58 #include "file-ops.h"
27c0285828f8 make copying images to the clipboard work with Qt graphics John W. Eaton <jwe@octave.org> parents: 20078 diff changeset	59 #include "unwind-prot.h"
20085 c58cf3a65519 improve copy to clipboard code for Qt plotting John W. Eaton <jwe@octave.org> parents: 20079 diff changeset	60 #include "utils.h"
21916 3a0c90b59584 Make qt figure window "Help" menu correspond to main window (bug #48223) Mike Miller <mtmiller@octave.org> parents: 21824 diff changeset	61 #include "version.h"
20079 27c0285828f8 make copying images to the clipboard work with Qt graphics John W. Eaton <jwe@octave.org> parents: 20078 diff changeset	62
27417 f844b1f03dcc update some header file lists in libgui sources John W. Eaton <jwe@octave.org> parents: 27376 diff changeset	63 #include "builtin-defun-decls.h"
27647 2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	64 #include "interpreter.h"
27335 50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27319 diff changeset	65
31646 c6d54dd31a7e maint: Use macros to begin/end C++ namespaces. John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	66 OCTAVE_BEGIN_NAMESPACE(octave)
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	67
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	68 DECLARE_GENERICEVENTNOTIFY_SENDER(MenuBar, QMenuBar);
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	69
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	70 static QRect
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	71 boundingBoxToRect (const Matrix& bb)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	72 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	73 QRect r;
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	74
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	75 if (bb.numel () == 4)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	76 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	77 r = QRect (octave::math::round (bb(0)), octave::math::round (bb(1)),
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	78 octave::math::round (bb(2)), octave::math::round (bb(3)));
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	79 if (! r.isValid ())
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	80 r = QRect ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	81 }
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	82
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	83 return r;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	84 }
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	85
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	86 static QImage
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	87 pointer_to_qimage (const Matrix& cdata)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	88 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	89 QImage retval (cdata.rows (), cdata.columns (), QImage::Format_ARGB32);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	90 QColor tmp ("White");
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	91 QColor black ("Black");
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	92 QColor white ("White");
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	93 for (octave_idx_type ii = 0; ii < cdata.rows (); ii++)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	94 for (octave_idx_type jj = 0; jj < cdata.columns (); jj++)
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	95 {
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	96 if (cdata(ii, jj) == 1.0)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	97 tmp = black;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	98 else if (cdata(ii, jj) == 2.0)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	99 tmp = white;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	100 else
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	101 tmp.setAlpha (0);
26821 f9b10a8a7c93 Allow changing the position of a maximized/fullscreen Qt figure. Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26820 diff changeset	102
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	103 retval.setPixel (jj, ii, tmp.rgba ());
23535 2aab625b502c Add getframe function for opengl based toolkits (bug #48195) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23449 diff changeset	104 }
2aab625b502c Add getframe function for opengl based toolkits (bug #48195) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23449 diff changeset	105
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	106 return retval;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	107 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	108
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	109 Figure *
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	110 Figure::create (octave::interpreter& interp,
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	111 const graphics_object& go)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	112 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	113 return new Figure (interp, go, new FigureWindow ());
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	114 }
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	115
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	116 Figure::Figure (octave::interpreter& interp,
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	117 const graphics_object& go, FigureWindow *win)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	118 : Object (interp, go, win), m_blockUpdates (false),
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	119 m_figureToolBar (nullptr), m_menuBar (nullptr), m_innerRect (),
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	120 m_outerRect (), m_previousHeight (0), m_resizable (true)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	121 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	122 m_container = new Container (win, interp);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	123 win->setCentralWidget (m_container);
24687 8b935067a257 Allow printing without updating qt visible or invisible figures (bug #52940). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24534 diff changeset	124
33239 775dde0cb3e5 use qOverload<T>(fptr) instead of QOverload<T>::of(fptr) John W. Eaton <jwe@octave.org> parents: 32632 diff changeset	125 connect (m_container, qOverload<const octave::fcn_callback&> (&Container::interpreter_event),
775dde0cb3e5 use qOverload<T>(fptr) instead of QOverload<T>::of(fptr) John W. Eaton <jwe@octave.org> parents: 32632 diff changeset	126 this, qOverload<const octave::fcn_callback&> (&Figure::interpreter_event));
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	127
33239 775dde0cb3e5 use qOverload<T>(fptr) instead of QOverload<T>::of(fptr) John W. Eaton <jwe@octave.org> parents: 32632 diff changeset	128 connect (m_container, qOverload<const octave::meth_callback&> (&Container::interpreter_event),
775dde0cb3e5 use qOverload<T>(fptr) instead of QOverload<T>::of(fptr) John W. Eaton <jwe@octave.org> parents: 32632 diff changeset	129 this, qOverload<const octave::meth_callback&> (&Figure::interpreter_event));
24691 b658e0fa0cb3 maint: Remove trailing whitespace from files. Rik <rik@octave.org> parents: 24687 diff changeset	130
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	131 figure::properties& fp = properties<figure> ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	132
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	133 // Adjust figure position
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	134 m_innerRect = boundingBoxToRect (fp.get_boundingbox (true));
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	135 m_outerRect = boundingBoxToRect (fp.get_boundingbox (false));
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	136
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	137 set_geometry (m_innerRect);
20531 dcfbf4c1c3c8 eliminate trailing whitespace and tabs from sources John W. Eaton <jwe@octave.org> parents: 20524 diff changeset	138
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	139 // Menubar
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	140 m_menuBar = new MenuBar (win);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	141 win->setMenuBar (m_menuBar);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	142 m_menuBar->addReceiver (this);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	143 m_menuBar->setStyleSheet (m_menuBar->styleSheet () + global_menubar_style);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	144
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	145 // Status bar
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	146 m_statusBar = win->statusBar ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	147 m_statusBar->setVisible (false);
31648 29d734430e5f maint: Re-indent code after switch to using namespace macros. John W. Eaton <jwe@octave.org> parents: 31646 diff changeset	148
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	149 if (fp.toolbar_is ("figure")
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	150 \|\| (fp.toolbar_is ("auto") && fp.menubar_is ("figure")))
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	151 showFigureStatusBar (true);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	152
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	153 // Enable mouse tracking unconditionally
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	154 enableMouseTracking ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	155
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	156 // When this constructor gets called all properties are already
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	157 // set, even non default. We force "update" here to get things right.
19967 3cc0734283dc style fixes in Qt graphics code John W. Eaton <jwe@octave.org> parents: 19955 diff changeset	158
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	159 // Figure title
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	160 update (figure::properties::ID_NUMBERTITLE);
31648 29d734430e5f maint: Re-indent code after switch to using namespace macros. John W. Eaton <jwe@octave.org> parents: 31646 diff changeset	161
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	162 // Decide what keyboard events we listen to
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	163 Canvas *canvas = m_container->canvas (m_handle);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	164 if (canvas)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	165 canvas->setEventMask (0);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	166 update (figure::properties::ID_KEYPRESSFCN);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	167 update (figure::properties::ID_KEYRELEASEFCN);
31648 29d734430e5f maint: Re-indent code after switch to using namespace macros. John W. Eaton <jwe@octave.org> parents: 31646 diff changeset	168
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	169 // modal style
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	170 update (figure::properties::ID_WINDOWSTYLE);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	171
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	172 // Handle resizing constraints
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	173 update (figure::properties::ID_RESIZE);
31648 29d734430e5f maint: Re-indent code after switch to using namespace macros. John W. Eaton <jwe@octave.org> parents: 31646 diff changeset	174
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	175 // Custom pointer data
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	176 update (figure::properties::ID_POINTERSHAPECDATA);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	177
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	178 // Visibility
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	179 update (figure::properties::ID_VISIBLE);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	180
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	181 connect (this, &Figure::asyncUpdate, this, &Figure::updateContainer);
31648 29d734430e5f maint: Re-indent code after switch to using namespace macros. John W. Eaton <jwe@octave.org> parents: 31646 diff changeset	182
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	183 // Register for the signal that indicates when a window has moved
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	184 // to a different screen
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	185 connect (win, &FigureWindow::figureWindowShown,
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	186 this, &Figure::figureWindowShown);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	187
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	188 win->addReceiver (this);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	189 m_container->addReceiver (this);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	190 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	191
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	192 Figure::~Figure ()
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	193 { }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	194
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	195 QString
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	196 Figure::fileName ()
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	197 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	198 gh_manager& gh_mgr = m_interpreter.get_gh_manager ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	199
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	200 octave::autolock guard (gh_mgr.graphics_lock ());
31648 29d734430e5f maint: Re-indent code after switch to using namespace macros. John W. Eaton <jwe@octave.org> parents: 31646 diff changeset	201
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	202 const figure::properties& fp = properties<figure> ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	203
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	204 std::string name = fp.get_filename ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	205
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	206 return QString::fromStdString (name);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	207 }
31648 29d734430e5f maint: Re-indent code after switch to using namespace macros. John W. Eaton <jwe@octave.org> parents: 31646 diff changeset	208
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	209 void
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	210 Figure::setFileName (const QString& name)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	211 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	212 gh_manager& gh_mgr = m_interpreter.get_gh_manager ();
31648 29d734430e5f maint: Re-indent code after switch to using namespace macros. John W. Eaton <jwe@octave.org> parents: 31646 diff changeset	213
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	214 octave::autolock guard (gh_mgr.graphics_lock ());
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	215
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	216 figure::properties& fp = properties<figure> ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	217
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	218 fp.set_filename (name.toStdString ());
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	219 }
27224 9b8903d3e626 Allow figure "keypressfcn" to work with uipanel on the way (bug #56598) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 27107 diff changeset	220
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	221 MouseMode
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	222 Figure::mouseMode ()
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	223 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	224 gh_manager& gh_mgr = m_interpreter.get_gh_manager ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	225
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	226 octave::autolock guard (gh_mgr.graphics_lock ());
31648 29d734430e5f maint: Re-indent code after switch to using namespace macros. John W. Eaton <jwe@octave.org> parents: 31646 diff changeset	227
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	228 const figure::properties& fp = properties<figure> ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	229
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	230 std::string mode = fp.get___mouse_mode__ ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	231
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	232 if (mode == "zoom")
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	233 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	234 octave_scalar_map zm = fp.get___zoom_mode__ ().scalar_map_value ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	235
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	236 std::string direction = zm.getfield ("Direction").string_value ();
31648 29d734430e5f maint: Re-indent code after switch to using namespace macros. John W. Eaton <jwe@octave.org> parents: 31646 diff changeset	237
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	238 mode += ' ' + direction;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	239 }
31648 29d734430e5f maint: Re-indent code after switch to using namespace macros. John W. Eaton <jwe@octave.org> parents: 31646 diff changeset	240
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	241 if (mode == "rotate")
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	242 return RotateMode;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	243 else if (mode == "zoom in")
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	244 return ZoomInMode;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	245 else if (mode == "zoom out")
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	246 return ZoomOutMode;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	247 else if (mode == "pan")
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	248 return PanMode;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	249 else if (mode == "text")
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	250 return TextMode;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	251
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	252 return NoMode;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	253 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	254
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	255 void
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	256 Figure::set_geometry (QRect r)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	257 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	258 QMainWindow *win = qWidget<QMainWindow> ();
19967 3cc0734283dc style fixes in Qt graphics code John W. Eaton <jwe@octave.org> parents: 19955 diff changeset	259
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	260 if (! m_resizable)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	261 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	262 win->setSizePolicy (QSizePolicy::Preferred, QSizePolicy::Preferred);
33359 689d4d069bbf maint: Use Octave coding convention of space between function name and parentheses in libgui/. Rik <rik@octave.org> parents: 33239 diff changeset	263 win->setFixedSize (QSize (QWIDGETSIZE_MAX, QWIDGETSIZE_MAX));
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	264 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	265
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	266 // Unlock window if it is maximized or full-screen
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	267 int state = win->windowState ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	268 if (state == Qt::WindowFullScreen \|\| state == Qt::WindowMaximized)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	269 win->setWindowState (Qt::WindowNoState);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	270
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	271 win->setGeometry (r);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	272
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	273 if (! m_resizable)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	274 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	275 win->setSizePolicy (QSizePolicy::Fixed, QSizePolicy::Fixed);
33359 689d4d069bbf maint: Use Octave coding convention of space between function name and parentheses in libgui/. Rik <rik@octave.org> parents: 33239 diff changeset	276 win->setFixedSize (win->size ());
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	277 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	278 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	279
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	280 Container *
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	281 Figure::innerContainer ()
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	282 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	283 return m_container;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	284 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	285
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	286 void
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	287 Figure::redraw ()
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	288 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	289 Canvas *canvas = m_container->canvas (m_handle);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	290
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	291 if (canvas)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	292 canvas->redraw ();
21996 d6370831d37f Set Qt Figure window modal/normal state based on WindowStyle (Bug #48160) John Donoghue <john.donoghue@ieee.org> parents: 21916 diff changeset	293
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	294 for (auto qobj : qWidget<QWidget> ()->findChildren<QObject > ())
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	295 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	296 if (qobj->objectName () == "UIPanel"
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	297 \|\| qobj->objectName () == "UIButtonGroup"
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	298 \|\| qobj->objectName () == "UIControl"
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	299 \|\| qobj->objectName () == "UITable")
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	300 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	301 Object *obj = Object::fromQObject (qobj);
21996 d6370831d37f Set Qt Figure window modal/normal state based on WindowStyle (Bug #48160) John Donoghue <john.donoghue@ieee.org> parents: 21916 diff changeset	302
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	303 if (obj)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	304 obj->slotRedraw ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	305 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	306 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	307 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	308
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	309 void
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	310 Figure::show ()
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	311 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	312 QWidget *win = qWidget<QWidget> ();
31757 02f6b7e64ac8 protect against dereferencing null pointer in Qt graphics Figure class John W. Eaton <jwe@octave.org> parents: 31745 diff changeset	313
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	314 win->activateWindow ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	315 win->raise ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	316 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	317
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	318 void
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	319 Figure::print (const QString& file_cmd, const QString& term)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	320 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	321 Canvas *canvas = m_container->canvas (m_handle);
27099 2cd31365c84a Implement "pointer" and related figure properties for Qt toolkit (bug #56347) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26902 diff changeset	322
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	323 if (canvas)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	324 canvas->print (file_cmd, term);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	325 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	326
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	327 uint8NDArray
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	328 Figure::slotGetPixels ()
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	329 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	330 uint8NDArray retval;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	331 Canvas *canvas = m_container->canvas (m_handle);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	332
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	333 if (canvas)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	334 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	335 gh_manager& gh_mgr = m_interpreter.get_gh_manager ();
31757 02f6b7e64ac8 protect against dereferencing null pointer in Qt graphics Figure class John W. Eaton <jwe@octave.org> parents: 31745 diff changeset	336
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	337 gh_mgr.process_events ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	338 octave::autolock guard (gh_mgr.graphics_lock ());
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	339 retval = canvas->getPixels ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	340 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	341
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	342 return retval;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	343 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	344
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	345 void
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	346 Figure::beingDeleted ()
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	347 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	348 Canvas *canvas = m_container->canvas (m_handle.value (), false);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	349
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	350 if (canvas)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	351 canvas->blockRedraw (true);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	352
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	353 m_container->removeReceiver (this);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	354 qWidget<FigureWindow> ()->removeReceiver (this);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	355 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	356
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	357 void
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	358 Figure::update (int pId)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	359 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	360 if (m_blockUpdates)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	361 return;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	362
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	363 figure::properties& fp = properties<figure> ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	364
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	365 if (fp.is___printing__ ())
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	366 return;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	367
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	368 QMainWindow *win = qWidget<QMainWindow> ();
21996 d6370831d37f Set Qt Figure window modal/normal state based on WindowStyle (Bug #48160) John Donoghue <john.donoghue@ieee.org> parents: 21916 diff changeset	369
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	370 // If the window doesn't exist, there's nothing we can do.
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	371 if (! win)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	372 return;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	373
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	374 m_blockUpdates = true;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	375
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	376 switch (pId)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	377 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	378 case figure::properties::ID_POSITION:
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	379 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	380 m_innerRect = boundingBoxToRect (fp.get_boundingbox (true));
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	381 int toffset = 0;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	382 int boffset = 0;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	383
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	384 for (auto tb : win->findChildren<QToolBar > ())
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	385 if (! tb->isHidden ())
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	386 toffset += tb->sizeHint ().height ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	387
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	388 if (! m_menuBar->isHidden ())
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	389 toffset += m_menuBar->sizeHint ().height ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	390
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	391 if (! m_statusBar->isHidden ())
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	392 boffset += m_statusBar->sizeHint ().height ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	393
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	394 set_geometry (m_innerRect.adjusted (0, -toffset, 0, boffset));
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	395 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	396 break;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	397
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	398 case figure::properties::ID_NAME:
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	399 case figure::properties::ID_NUMBERTITLE:
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	400 win->setWindowTitle (Utils::fromStdString (fp.get_title ()));
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	401 break;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	402
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	403 case figure::properties::ID_VISIBLE:
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	404 if (fp.is_visible ())
31757 02f6b7e64ac8 protect against dereferencing null pointer in Qt graphics Figure class John W. Eaton <jwe@octave.org> parents: 31745 diff changeset	405 {
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	406 QTimer::singleShot (0, win, &QMainWindow::show);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	407 if (! fp.is___gl_window__ ())
31757 02f6b7e64ac8 protect against dereferencing null pointer in Qt graphics Figure class John W. Eaton <jwe@octave.org> parents: 31745 diff changeset	408 {
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	409 gh_manager& gh_mgr = m_interpreter.get_gh_manager ();
31757 02f6b7e64ac8 protect against dereferencing null pointer in Qt graphics Figure class John W. Eaton <jwe@octave.org> parents: 31745 diff changeset	410
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	411 octave::autolock guard (gh_mgr.graphics_lock ());
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	412 fp.set ("__gl_window__", "on");
31757 02f6b7e64ac8 protect against dereferencing null pointer in Qt graphics Figure class John W. Eaton <jwe@octave.org> parents: 31745 diff changeset	413 }
02f6b7e64ac8 protect against dereferencing null pointer in Qt graphics Figure class John W. Eaton <jwe@octave.org> parents: 31745 diff changeset	414 }
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	415 else
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	416 win->hide ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	417 break;
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	418
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	419 case figure::properties::ID_RESIZE:
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	420 if (fp.is_resize ())
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	421 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	422 win->setSizePolicy (QSizePolicy::Preferred, QSizePolicy::Preferred);
33359 689d4d069bbf maint: Use Octave coding convention of space between function name and parentheses in libgui/. Rik <rik@octave.org> parents: 33239 diff changeset	423 win->setFixedSize (QSize (QWIDGETSIZE_MAX, QWIDGETSIZE_MAX));
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	424 m_resizable = true;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	425 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	426 else
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	427 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	428 win->setSizePolicy (QSizePolicy::Fixed, QSizePolicy::Fixed);
33359 689d4d069bbf maint: Use Octave coding convention of space between function name and parentheses in libgui/. Rik <rik@octave.org> parents: 33239 diff changeset	429 win->setFixedSize (win->size ());
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	430 m_resizable = false;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	431 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	432 break;
27376 1952e110d346 Allow Qt graphics callbacks to work again (bug #56857) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 27335 diff changeset	433
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	434 case figure::properties::ID_MENUBAR:
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	435 case figure::properties::ID_TOOLBAR:
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	436 if (fp.toolbar_is ("none"))
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	437 showFigureStatusBar (false);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	438 else if (fp.toolbar_is ("figure"))
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	439 showFigureStatusBar (true);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	440 else // "auto"
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	441 showFigureStatusBar (fp.menubar_is ("figure"));
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	442 break;
31648 29d734430e5f maint: Re-indent code after switch to using namespace macros. John W. Eaton <jwe@octave.org> parents: 31646 diff changeset	443
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	444 case figure::properties::ID_KEYPRESSFCN:
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	445 {
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	446 Canvas *canvas = m_container->canvas (m_handle);
31648 29d734430e5f maint: Re-indent code after switch to using namespace macros. John W. Eaton <jwe@octave.org> parents: 31646 diff changeset	447
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	448 if (canvas)
24465 1b4c4d6ead56 Make mouse clicks update currentfigure (bug #52698). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24446 diff changeset	449 {
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	450 if (fp.get_keypressfcn ().isempty ())
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	451 canvas->clearEventMask (Canvas::KeyPress);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	452 else
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	453 canvas->addEventMask (Canvas::KeyPress);
24465 1b4c4d6ead56 Make mouse clicks update currentfigure (bug #52698). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24446 diff changeset	454 }
31648 29d734430e5f maint: Re-indent code after switch to using namespace macros. John W. Eaton <jwe@octave.org> parents: 31646 diff changeset	455
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	456 // Signal the change to uipanels as well
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	457 for (auto qobj : qWidget<QWidget> ()->findChildren<QObject > ())
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	458 {
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	459 if (qobj->objectName () == "UIPanel")
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	460 {
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	461 Object *obj = Object::fromQObject (qobj);
31648 29d734430e5f maint: Re-indent code after switch to using namespace macros. John W. Eaton <jwe@octave.org> parents: 31646 diff changeset	462
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	463 if (obj)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	464 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	465 if (fp.get_keypressfcn ().isempty ())
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	466 obj->innerContainer ()->canvas (m_handle)->
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	467 clearEventMask (Canvas::KeyPress);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	468 else
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	469 obj->innerContainer ()->canvas (m_handle)->
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	470 addEventMask (Canvas::KeyPress);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	471 }
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	472 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	473 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	474 }
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	475 break;
31648 29d734430e5f maint: Re-indent code after switch to using namespace macros. John W. Eaton <jwe@octave.org> parents: 31646 diff changeset	476
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	477 case figure::properties::ID_KEYRELEASEFCN:
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	478 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	479 Canvas *canvas = m_container->canvas (m_handle);
19967 3cc0734283dc style fixes in Qt graphics code John W. Eaton <jwe@octave.org> parents: 19955 diff changeset	480
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	481 if (canvas)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	482 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	483 if (fp.get_keyreleasefcn ().isempty ())
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	484 canvas->clearEventMask (Canvas::KeyRelease);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	485 else
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	486 canvas->addEventMask (Canvas::KeyRelease);
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	487 }
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	488 break;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	489 // Signal the change to uipanels as well
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	490 for (auto qobj : qWidget<QWidget> ()->findChildren<QObject > ())
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	491 {
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	492 if (qobj->objectName () == "UIPanel")
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	493 {
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	494 Object *obj = Object::fromQObject (qobj);
31648 29d734430e5f maint: Re-indent code after switch to using namespace macros. John W. Eaton <jwe@octave.org> parents: 31646 diff changeset	495
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	496 if (obj)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	497 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	498 if (fp.get_keypressfcn ().isempty ())
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	499 obj->innerContainer ()->canvas (m_handle)->
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	500 clearEventMask (Canvas::KeyRelease);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	501 else
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	502 obj->innerContainer ()->canvas (m_handle)->
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	503 addEventMask (Canvas::KeyRelease);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	504 }
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	505 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	506 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22370 diff changeset	507 }
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	508 break;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	509
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	510 case figure::properties::ID_WINDOWSTYLE:
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	511 if (fp.windowstyle_is ("modal"))
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	512 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	513 bool is_visible = win->isVisible ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	514
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	515 // if window is already visible, need to hide and reshow it in order to
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	516 // make it use the modal settings
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	517 if (is_visible)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	518 win->setVisible (false);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	519
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	520 win->setWindowModality (Qt::ApplicationModal);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	521 win->setVisible (is_visible);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	522 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	523 else
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	524 win->setWindowModality (Qt::NonModal);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	525
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	526 break;
19685 7335cc071ab0 make save and saveas menu items work in Qt figure window John W. Eaton <jwe@octave.org> parents: 19681 diff changeset	527
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	528 case figure::properties::ID_POINTERSHAPECDATA:
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	529 m_pointer_cdata =
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	530 pointer_to_qimage (fp.get_pointershapecdata ().matrix_value ());
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	531 if (fp.get_pointer () != "custom")
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	532 break;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	533 OCTAVE_FALLTHROUGH;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	534
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	535 case figure::properties::ID_POINTER:
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	536 case figure::properties::ID_POINTERSHAPEHOTSPOT:
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	537 case figure::properties::ID___MOUSE_MODE__:
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	538 case figure::properties::ID___ZOOM_MODE__:
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	539 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	540 Canvas *canvas = m_container->canvas (m_handle);
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	541
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	542 if (canvas)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	543 canvas->setCursor (mouseMode (), fp.get_pointer (),
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	544 m_pointer_cdata,
33359 689d4d069bbf maint: Use Octave coding convention of space between function name and parentheses in libgui/. Rik <rik@octave.org> parents: 33239 diff changeset	545 fp.get_pointershapehotspot ().matrix_value ());
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	546 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	547 break;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	548
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	549 default:
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	550 break;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	551 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	552
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	553 m_blockUpdates = false;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	554 }
21916 3a0c90b59584 Make qt figure window "Help" menu correspond to main window (bug #48223) Mike Miller <mtmiller@octave.org> parents: 21824 diff changeset	555
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	556 void
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	557 Figure::showFigureStatusBar (bool visible)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	558 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	559 if (m_statusBar
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	560 && (! m_statusBar->isHidden ()) != visible)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	561 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	562 int dy = m_statusBar->sizeHint ().height ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	563 QRect r = qWidget<QWidget> ()->geometry ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	564
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	565 if (! visible)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	566 r.adjust (0, 0, 0, -dy);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	567 else
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	568 r.adjust (0, 0, 0, dy);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	569
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	570 m_blockUpdates = true;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	571 set_geometry (r);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	572 m_statusBar->setVisible (visible);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	573 m_blockUpdates = false;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	574
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	575 updateBoundingBox (false);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	576 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	577 }
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	578
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	579 void
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	580 Figure::updateFigureHeight (int dh)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	581 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	582 gh_manager& gh_mgr = m_interpreter.get_gh_manager ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	583
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	584 octave::autolock guard (gh_mgr.graphics_lock ());
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	585 graphics_object go = object ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	586
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	587 if (go.valid_object () && dh != 0)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	588 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	589 QRect r = qWidget<QWidget> ()->geometry ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	590
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	591 r.adjust (0, dh, 0, 0);
31648 29d734430e5f maint: Re-indent code after switch to using namespace macros. John W. Eaton <jwe@octave.org> parents: 31646 diff changeset	592
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	593 m_blockUpdates = true;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	594 set_geometry (r);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	595 m_blockUpdates = false;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	596
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	597 updateBoundingBox (false);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	598 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	599 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	600
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	601 void
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	602 Figure::updateStatusBar (ColumnVector pt)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	603 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	604 if (! m_statusBar->isHidden ())
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	605 m_statusBar->showMessage (QString ("(%1, %2)")
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	606 .arg (pt(0), 0, 'g', 5)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	607 .arg (pt(1), 0, 'g', 5));
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	608 }
31648 29d734430e5f maint: Re-indent code after switch to using namespace macros. John W. Eaton <jwe@octave.org> parents: 31646 diff changeset	609
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	610 void
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	611 Figure::do_connections (const QObject receiver, const QObject /* emitter */)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	612 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	613 Object::do_connections (receiver);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	614 Object::do_connections (receiver, m_container->canvas (m_handle));
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	615 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	616
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	617 QWidget *
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	618 Figure::menu ()
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	619 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	620 return qWidget<QMainWindow> ()->menuBar ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	621 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	622
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	623 void
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	624 Figure::updateBoundingBox (bool internal, int flags)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	625 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	626 QWidget *win = qWidget<QWidget> ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	627 Matrix bb (1, 4);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	628 std::string prop;
19685 7335cc071ab0 make save and saveas menu items work in Qt figure window John W. Eaton <jwe@octave.org> parents: 19681 diff changeset	629
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	630 if (internal)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	631 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	632 prop = "position";
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	633 QRect r = m_innerRect;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	634
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	635 if (flags & UpdateBoundingBoxPosition)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	636 r.moveTopLeft (win->mapToGlobal (m_container->pos ()));
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	637 if (flags & UpdateBoundingBoxSize)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	638 r.setSize (m_container->size ());
31648 29d734430e5f maint: Re-indent code after switch to using namespace macros. John W. Eaton <jwe@octave.org> parents: 31646 diff changeset	639
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	640 if (r.isValid () && r != m_innerRect)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	641 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	642 m_innerRect = r;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	643
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	644 bb(0) = r.x ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	645 bb(1) = r.y ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	646 bb(2) = r.width ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	647 bb(3) = r.height ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	648 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	649 else
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	650 return;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	651 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	652 else
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	653 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	654 prop = "outerposition";
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	655 QRect r = m_outerRect;
26869 992f55ef87f5 Use an uitoolbar and uitools to build the default figure toolbar (bug #55795) Pantxo Diribarne <pantxo.diribarne@gmail.com>* parents: 26821 diff changeset	656
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	657 if (flags & UpdateBoundingBoxPosition)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	658 r.moveTopLeft (win->pos ());
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	659 if (flags & UpdateBoundingBoxSize)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	660 r.setSize (win->frameGeometry ().size ());
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	661
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	662 if (r.isValid () && r != m_outerRect)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	663 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	664 m_outerRect = r;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	665
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	666 bb(0) = r.x ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	667 bb(1) = r.y ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	668 bb(2) = r.width ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	669 bb(3) = r.height ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	670 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	671 else
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	672 return;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	673 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	674
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	675 figure::properties& fp = properties<figure> ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	676
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	677 emit gh_set_event (m_handle, prop, fp.bbox2position (bb), false,
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	678 prop == "position");
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	679 }
31648 29d734430e5f maint: Re-indent code after switch to using namespace macros. John W. Eaton <jwe@octave.org> parents: 31646 diff changeset	680
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	681 bool
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	682 Figure::eventNotifyBefore (QObject obj, QEvent xevent)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	683 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	684 if (! m_blockUpdates)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	685 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	686 // Clicking the toolbar or the menubar makes this figure current
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	687 if (xevent->type () == QEvent::MouseButtonPress)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	688 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	689 figure::properties& fp = properties<figure> ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	690
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	691 gh_manager& gh_mgr = m_interpreter.get_gh_manager ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	692
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	693 graphics_object root = gh_mgr.get_object (0);
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	694
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	695 if (fp.get_handlevisibility () == "on")
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	696 root.set ("currentfigure",
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	697 fp.get___myhandle__ ().as_octave_value ());
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	698 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	699
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	700 if (obj == m_container)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	701 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	702 // Do nothing...
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	703 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	704 else if (obj == m_menuBar)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	705 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	706 switch (xevent->type ())
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	707 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	708 case QEvent::ActionAdded:
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	709 case QEvent::ActionChanged:
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	710 case QEvent::ActionRemoved:
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	711 m_previousHeight = m_menuBar->sizeHint ().height ();
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	712
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	713 default:
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	714 break;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	715 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	716 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	717 else
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	718 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	719 switch (xevent->type ())
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	720 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	721 case QEvent::Close:
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	722 xevent->ignore ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	723 emit gh_callback_event (m_handle, "closerequestfcn");
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	724 return true;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	725
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	726 default:
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	727 break;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	728 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	729 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	730 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	731
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	732 return false;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	733 }
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	734
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	735 void
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	736 Figure::eventNotifyAfter (QObject watched, QEvent xevent)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	737 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	738 if (! m_blockUpdates)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	739 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	740 if (watched == m_container)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	741 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	742 gh_manager& gh_mgr = m_interpreter.get_gh_manager ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	743
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	744 switch (xevent->type ())
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	745 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	746 case QEvent::Resize:
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	747 updateBoundingBox (true, UpdateBoundingBoxSize);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	748 break;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	749
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	750 case QEvent::ChildAdded:
33359 689d4d069bbf maint: Use Octave coding convention of space between function name and parentheses in libgui/. Rik <rik@octave.org> parents: 33239 diff changeset	751 if (dynamic_cast<QChildEvent *> (xevent)->child ()->isWidgetType())
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	752 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	753 octave::autolock guard (gh_mgr.graphics_lock ());
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	754 update (figure::properties::ID_TOOLBAR);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	755
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	756 enableMouseTracking ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	757 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	758 break;
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	759
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	760 case QEvent::ChildRemoved:
33359 689d4d069bbf maint: Use Octave coding convention of space between function name and parentheses in libgui/. Rik <rik@octave.org> parents: 33239 diff changeset	761 if (dynamic_cast<QChildEvent *> (xevent)->child ()->isWidgetType())
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	762 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	763 octave::autolock guard (gh_mgr.graphics_lock ());
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	764 update (figure::properties::ID_TOOLBAR);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	765 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	766 break;
31648 29d734430e5f maint: Re-indent code after switch to using namespace macros. John W. Eaton <jwe@octave.org> parents: 31646 diff changeset	767
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	768 default:
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	769 break;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	770 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	771 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	772 else if (watched == m_menuBar)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	773 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	774 switch (xevent->type ())
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	775 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	776 case QEvent::ActionAdded:
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	777 case QEvent::ActionChanged:
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	778 case QEvent::ActionRemoved:
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	779 // The menubar may have been resized if no action is visible
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	780 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	781 QAction a = dynamic_cast<QActionEvent > (xevent)->action ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	782 int currentHeight = m_menuBar->sizeHint ().height ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	783 if (currentHeight != m_previousHeight
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	784 && ! a->isSeparator ())
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	785 updateFigureHeight (m_previousHeight - currentHeight);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	786 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	787 break;
25889 2da65009cc7f Fix graphics object selection on high resolution screens (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25888 diff changeset	788
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	789 default:
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	790 break;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	791 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	792 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	793 else
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	794 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	795 switch (xevent->type ())
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	796 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	797 case QEvent::Move:
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	798 updateBoundingBox (false, UpdateBoundingBoxPosition);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	799 updateBoundingBox (true, UpdateBoundingBoxPosition);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	800 break;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	801
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	802 case QEvent::Resize:
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	803 updateBoundingBox (false, UpdateBoundingBoxSize);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	804 break;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	805
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	806 default:
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	807 break;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	808 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	809 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	810 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	811 }
31648 29d734430e5f maint: Re-indent code after switch to using namespace macros. John W. Eaton <jwe@octave.org> parents: 31646 diff changeset	812
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	813 void
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	814 Figure::addCustomToolBar (QToolBar *bar, bool visible, bool isdefault)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	815 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	816 QMainWindow *win = qWidget<QMainWindow> ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	817
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	818 if (isdefault)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	819 m_figureToolBar = bar;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	820
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	821 if (! visible)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	822 win->addToolBar (bar);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	823 else
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	824 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	825 QSize sz = bar->sizeHint ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	826 QRect r = win->geometry ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	827
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	828 r.adjust (0, -sz.height (), 0, 0);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	829
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	830 m_blockUpdates = true;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	831 set_geometry (r);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	832 win->addToolBarBreak ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	833 win->addToolBar (bar);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	834 m_blockUpdates = false;
27335 50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27319 diff changeset	835
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	836 updateBoundingBox (false);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	837 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	838 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	839
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	840 void
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	841 Figure::showCustomToolBar (QToolBar *bar, bool visible)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	842 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	843 QMainWindow *win = qWidget<QMainWindow> ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	844
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	845 if ((! bar->isHidden ()) != visible)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	846 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	847 QSize sz = bar->sizeHint ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	848 QRect r = win->geometry ();
25889 2da65009cc7f Fix graphics object selection on high resolution screens (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25888 diff changeset	849
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	850 if (visible)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	851 r.adjust (0, -sz.height (), 0, 0);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	852 else
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	853 r.adjust (0, sz.height (), 0, 0);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	854
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	855 m_blockUpdates = true;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	856 set_geometry (r);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	857 bar->setVisible (visible);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	858 m_blockUpdates = false;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	859
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	860 updateBoundingBox (false);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	861 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	862 }
25884 4e108574385c Improve OpenGL rendering on high resolution screens with Qt 5 (bug #49053) John Swensen <jpswensen@gmail.com> parents: 25878 diff changeset	863
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	864 void
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	865 Figure::updateContainer ()
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	866 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	867 redraw ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	868 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	869
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	870 void
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	871 Figure::figureWindowShown ()
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	872 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	873 QWindow *window = qWidget<QMainWindow> ()->windowHandle ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	874 QScreen *screen = window->screen ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	875
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	876 gh_manager& gh_mgr = m_interpreter.get_gh_manager ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	877
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	878 octave::autolock guard (gh_mgr.graphics_lock ());
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	879
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	880 figure::properties& fp = properties<figure> ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	881 fp.set___device_pixel_ratio__ (screen->devicePixelRatio ());
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	882
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	883 connect (window, &QWindow::screenChanged, this, &Figure::screenChanged);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	884 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	885
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	886 void
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	887 Figure::screenChanged (QScreen *screen)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	888 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	889 gh_manager& gh_mgr = m_interpreter.get_gh_manager ();
31757 02f6b7e64ac8 protect against dereferencing null pointer in Qt graphics Figure class John W. Eaton <jwe@octave.org> parents: 31745 diff changeset	890
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	891 octave::autolock guard (gh_mgr.graphics_lock ());
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	892
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	893 figure::properties& fp = properties<figure> ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	894 double old_dpr = fp.get___device_pixel_ratio__ ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	895 double new_dpr = screen->devicePixelRatio ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	896 if (old_dpr != new_dpr)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	897 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	898 fp.set___device_pixel_ratio__ (new_dpr);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	899
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	900 // For some obscure reason, changing the __device_pixel_ratio__ property
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	901 // from the GUI thread does not necessarily trigger a redraw. Force it.
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	902 redraw ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	903 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	904 }
31757 02f6b7e64ac8 protect against dereferencing null pointer in Qt graphics Figure class John W. Eaton <jwe@octave.org> parents: 31745 diff changeset	905
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	906 void
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	907 Figure::enableMouseTracking ()
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	908 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	909 // Enable mouse tracking on every widgets
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	910 m_container->setMouseTracking (true);
31757 02f6b7e64ac8 protect against dereferencing null pointer in Qt graphics Figure class John W. Eaton <jwe@octave.org> parents: 31745 diff changeset	911
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	912 Canvas *canvas = m_container->canvas (m_handle);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	913
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	914 if (canvas)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	915 canvas->qWidget ()->setMouseTracking (true);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	916
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	917 for (auto w : m_container->findChildren<QWidget > ())
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	918 w->setMouseTracking (true);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	919 }
20594 46edfbd31ad7 Fix execution of "windowbuttonmotionfcn" with uipanels (bug #46151) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20537 diff changeset	920
31646 c6d54dd31a7e maint: Use macros to begin/end C++ namespaces. John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	921 OCTAVE_END_NAMESPACE(octave)

Mercurial > octave

annotate libgui/graphics/Figure.cc @ 33359:689d4d069bbf