X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FGuiWorkArea.h;h=4ec0af11a9fbd320b0bea301543a3b64563d9f06;hb=425d092204118ea6c24c28e85fdf03fcf2bb51a4;hp=84e71298eb01d6c7d94d6c21f30de92a49fd7b15;hpb=09738dbba43faca1dbf9de0125135b7ee645f7ad;p=lyx.git diff --git a/src/frontends/qt4/GuiWorkArea.h b/src/frontends/qt4/GuiWorkArea.h index 84e71298eb..4ec0af11a9 100644 --- a/src/frontends/qt4/GuiWorkArea.h +++ b/src/frontends/qt4/GuiWorkArea.h @@ -35,6 +35,7 @@ class QDropEvent; class QKeyEvent; class QWheelEvent; class QPaintEvent; +class QToolButton; class QWidget; #ifdef CursorShape @@ -86,7 +87,8 @@ public: bool restart_timeout; int x_old; int y_old; - double scrollbar_value_old; + int min_scrollbar_old; + int max_scrollbar_old; }; @@ -124,7 +126,7 @@ public: /// BufferView const & bufferView() const; /// - void redraw(); + void redraw(bool update_metrics); /// void stopBlinkingCursor(); /// @@ -182,7 +184,7 @@ private: /// hide the cursor virtual void removeCursor(); - /// This function is called when the buffer readonly status change. + /// This function should be called to update the buffer readonly status. void setReadOnly(bool); /// Update window titles of all users. @@ -229,6 +231,8 @@ private: /// BufferView * buffer_view_; + /// Read only Buffer status cache. + bool read_only_; /// GuiView * lyx_view_; /// is the cursor currently displayed @@ -258,6 +262,10 @@ private: /// Special mode in which Esc and Enter (with or without Shift) /// are ignored bool dialog_mode_; + /// store the position of the rightclick when the mouse is + /// pressed. This is used to get the correct context menu + /// when the menu is actually shown (after releasing on Windwos). + QPoint context_target_pos_; }; // GuiWorkArea @@ -278,17 +286,11 @@ public: protected: /// - void showEvent(QShowEvent * ev); - /// this happens when the dialog is simply closed/hidden - void closeEvent(QCloseEvent * e); - -private Q_SLOTS: - /// this happens 100ms after dialog showEvent() - void onDelayedFocus(); + void closeEvent(QCloseEvent * ev); + /// + void hideEvent(QHideEvent *ev); private: - /// @TODO: Investigate on focus issue and remove this ugly hack, please ! - QTimer delayed_focus_timer_; /// Embedded Buffer. Buffer * buffer_; }; // EmbeddedWorkArea @@ -320,8 +322,10 @@ Q_SIGNALS: public Q_SLOTS: /// close current buffer, or the one given by \c clicked_tab_ void closeCurrentBuffer(); - /// close current tab, or the one given by \c clicked_tab_ - void closeCurrentTab(); + /// hide current tab, or the one given by \c clicked_tab_ + void hideCurrentTab(); + /// close the tab given by \c index + void closeTab(int index); /// void updateTabTexts(); @@ -334,7 +338,10 @@ private Q_SLOTS: void moveTab(int fromIndex, int toIndex); private: + /// int clicked_tab_; + /// + QToolButton * closeBufferButton; }; // TabWorkArea