Mercurial > octave
view libgui/src/octave-dock-widget.h @ 27089:9326c2258e60
fix visibility of find dialog when editor is docked/undocked (bug #5)
* file-editor-interface.h: implementation of virtual slot toplevel_change
* file-editor-tab.cc (handle_toplevel_changed): new slot for editor singal
when editor toplevel changed, destroying and re-creating find dialog where
the state of the dialog is saved in a new structure;
(handle_find_dialog_finished): store geometry and visibility in the new
data structure of the find dialog;
(find_create): new method with the main actions for creating the find dialog
moved from find (), this method is called for re-creating the dialog
(find): move most of this slot into new method find_create, only leave
actions for very first initialization of the dialog;
(change_editor_state): use new data struct instead of separate variables
for saving and restoring dialog data
* file-editor-tab.h: new slot handle_toplevel_changed, new method
find_create, new structure for saving dialog data
* file-editor.cc (toplevel_changed): implementation of new slot for signal
on toplevel changed;
(add_file_editor_tab): connect editor signal on toplevel changed to the
related slot in file_editor_tab
* file-editor.h: new signal fetab_toplevel_changed, new slot toplevel_change
* find-dialog.cc (save_data): new method for saving the current state of
the find dialog in a structure passed by the caller;
(restore_data): new method for restoring the current state from a given
data structure;
* find-dialog.h: typedef of data structure with enum for the binary options,
new methods for saving and restoring data in/from the structure
* octave-dock-widget.cc (make_window): manually emit toplevelChanged signal
in case we undock a widget since our methid seems to prevent qt from
doing so
* octave-dock-widget.h: make slot toplevel_changed protected and virtual
allowing a re-implementation in specific widgets
author | Torsten Lilge <ttl-octave@mailbox.org> |
---|---|
date | Tue, 14 May 2019 22:41:32 +0200 |
parents | f7b10bd40045 |
children | 420611c61298 |
line wrap: on
line source
/* Copyright (C) 2012-2019 Richard Crozier This file is part of Octave. Octave is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. Octave is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with Octave; see the file COPYING. If not, see <https://www.gnu.org/licenses/>. */ #if ! defined (octave_octave_dock_widget_h) #define octave_octave_dock_widget_h 1 #include <QDockWidget> #include <QSettings> #include <QIcon> #include <QMainWindow> #include <QToolButton> #include <QMouseEvent> #include "octave-cmd.h" namespace octave { // The few decoration items common to both main window and variable editor. class label_dock_widget : public QDockWidget { Q_OBJECT public: label_dock_widget (QWidget *p = nullptr); // set_title() uses the custom title bar while setWindowTitle() uses // the default title bar (with style sheets) void set_title (const QString&); protected slots: //! Slots to handle copy & paste. //!@{ virtual void copyClipboard (void) { } virtual void pasteClipboard (void) { } virtual void selectAll (void) { } //!@} //! Slot to handle undo. virtual void do_undo (void) { } protected: int m_icon_size; QWidget *m_title_widget; QToolButton *m_dock_button; QToolButton *m_close_button; QAction *m_dock_action; QAction *m_close_action; QAbstractButton *m_default_float_button; QAbstractButton *m_default_close_button; }; class octave_dock_widget : public label_dock_widget { Q_OBJECT public: octave_dock_widget (const QString& obj_name, QWidget *p = nullptr); virtual ~octave_dock_widget (void) = default; virtual void connect_visibility_changed (void); void set_predecessor_widget (octave_dock_widget *prev_widget); signals: //! Custom signal that tells whether a user has clicked away that dock //! widget, i.e the active dock widget has changed. void active_changed (bool active); void queue_make_window (bool widget_was_dragged); void queue_make_widget (void); void request_queue_cmd (octave_cmd *); protected: virtual void closeEvent (QCloseEvent *e); QWidget * focusWidget (void); bool event (QEvent *event); public slots: virtual void focus (void) { if (! isVisible ()) setVisible (true); setFocus (); activateWindow (); raise (); } virtual void handle_visibility (bool visible) { if (visible && ! isFloating ()) focus (); } virtual void notice_settings (const QSettings*) { } void handle_settings (const QSettings*); void handle_active_dock_changed (octave_dock_widget*, octave_dock_widget*); QMainWindow * main_win (void) { return m_parent; } void save_settings (void); void moveEvent (QMoveEvent *event); void resizeEvent (QResizeEvent *event); void make_window (bool widget_was_dragged = false); void make_widget (bool not_used = false); void default_dock (bool not_used = false); protected slots: virtual void toplevel_change (bool); //! Slot to steer changing visibility from outside. virtual void handle_visibility_changed (bool visible) { if (visible) emit active_changed (true); } //! Event filter for double clicks into the window decoration elements. bool eventFilter (QObject *obj, QEvent *e); private slots: void change_visibility (bool); private: void set_style (bool active); void set_focus_predecessor (void); void store_geometry (void); //! Stores the parent, since we are reparenting to 0. QMainWindow *m_parent; bool m_custom_style; int m_title_3d; QColor m_bg_color; QColor m_bg_color_active; QColor m_fg_color; QColor m_fg_color_active; QString m_icon_color; QString m_icon_color_active; octave_dock_widget *m_predecessor_widget; QRect m_recent_float_geom; QByteArray m_recent_dock_geom; bool m_waiting_for_mouse_button_release; }; } #endif