flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-31 21:15:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #347, improvements in CInfoArea and CDockWidget

Browse Source 
* renamed to toggleFloatingWholeInfoArea() for whole info area (in contrast to toggleInfoArea for individual areas)
* signal for changedWholeInfoAreaFloating (allows the main GUI to hide this area if empty)
* add. flag to understand m_resetedFloating
* prepared for frameless dock widget (not yet implemented)
This commit is contained in:
Klaus Basan
2014-11-25 00:08:05 +01:00
committed by Roland Winklmeier
parent edaf1fba89
commit bd2bf0d3ba
6 changed files with 48 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/blackgui/dockwidget.h
View File

@@ -13,6 +13,7 @@
#define BLACKGUI_DOCKWIDGET_H
#include "managedstatusbar.h"
#include "enableforframelesswindow.h"
#include <QDockWidget>
#include <QTabWidget>
@@ -31,7 +32,9 @@ namespace BlackGui
//! \sa CInfoArea
//! \sa CDockWidgetInfoArea
//! \sa CDockWidgetInfoBar
class CDockWidget : public QDockWidget
class CDockWidget :
public QDockWidget,
public CEnableForFramelessWindow
{
Q_OBJECT
@@ -77,7 +80,7 @@ namespace BlackGui
void showTitleWhenDocked(bool show);
//! Reset first time floating, marked as never floated before
void resetWasAlreadyFLoating() { this->m_wasAlreadyFloating = false; }
void resetWasAlreadyFloating() { this->m_wasAlreadyFloating = false; this->m_resetedFloating = true; }
//! Was widget already floating?
bool wasAlreadyFloating() const { return this->m_wasAlreadyFloating; }
@@ -118,6 +121,12 @@ namespace BlackGui
//! \copydoc QWidget::paintEvent
virtual void paintEvent(QPaintEvent *event) override;
//! \copy QMainWindow::mouseMoveEvent
virtual void mouseMoveEvent(QMouseEvent *event) override { if (!handleMouseMoveEvent(event)) { QDockWidget::mouseMoveEvent(event); } ; }
//! \copy QMainWindow::mousePressEvent
virtual void mousePressEvent(QMouseEvent *event) override { if (!handleMousePressEvent(event)) { QDockWidget::mousePressEvent(event); } }
//! Contribute to menu
virtual void addToContextMenu(QMenu *contextMenu) const;
@@ -153,6 +162,7 @@ namespace BlackGui
bool m_allowStatusBar = true;
bool m_windowTitleWhenDocked = true;
bool m_wasAlreadyFloating = false;
bool m_resetedFloating = false;
bool m_selected = false; //!< selected when tabbed
bool m_dockWidgetVisible = false; //!< logical visible, not to be confused with QDockWidget::isVisible()