flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-20 20:40:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ref T447, dock widget style

Browse Source
This commit is contained in:
Klaus Basan
2018-12-03 08:25:53 +01:00
parent f54bb1d9e9
commit a8321f3563
2 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/blackgui/dockwidget.cpp
View File

@@ -394,8 +394,8 @@ namespace BlackGui
QString CDockWidget::windowTitleOrBackup() const QString CDockWidget::windowTitleOrBackup() const
{ {
QString t(windowTitle()); const QString t(windowTitle());
if (t.isEmpty()) { return windowTitleBackup(); } if (t.isEmpty()) { return this->windowTitleBackup(); }
return t; return t;
} }

23
src/blackgui/dockwidget.h
View File

@@ -99,13 +99,6 @@ namespace BlackGui
//! \copydoc CEnableForFramelessWindow::setFrameless //! \copydoc CEnableForFramelessWindow::setFrameless
virtual void setFrameless(bool frameless) override; virtual void setFrameless(bool frameless) override;
//! Value for dynamic property "dockwidget"
static const QString &propertyOuterWidget();
//! Value for dynamic property "dockwidget"
static const QString &propertyInnerWidget();
public slots:
//! Toggle floating //! Toggle floating
void toggleFloating(); void toggleFloating();
@@ -136,6 +129,12 @@ namespace BlackGui
//! Display status messages //! Display status messages
void displayStatusMessages(const BlackMisc::CStatusMessageList &statusMessages); void displayStatusMessages(const BlackMisc::CStatusMessageList &statusMessages);
//! Value for dynamic property "dockwidget"
static const QString &propertyOuterWidget();
//! Value for dynamic property "dockwidget"
static const QString &propertyInnerWidget();
signals: signals:
//! Top level has changed for given widget //! Top level has changed for given widget
void widgetTopLevelChanged(CDockWidget *, bool topLevel); void widgetTopLevelChanged(CDockWidget *, bool topLevel);
@@ -214,17 +213,17 @@ namespace BlackGui
QWidgetAction *m_marginMenuAction = nullptr; //!< menu widget(!) action for margin widget QWidgetAction *m_marginMenuAction = nullptr; //!< menu widget(!) action for margin widget
Components::CMarginsInput *m_input = nullptr; //!< margins widget Components::CMarginsInput *m_input = nullptr; //!< margins widget
Menus::CFontMenu *m_fontMenu = nullptr; //!< Font menu Menus::CFontMenu *m_fontMenu = nullptr; //!< Font menu
CManagedStatusBar m_statusBar; //!< status bar when floating
QString m_windowTitleBackup; //!< original title, even if the widget title is deleted for layout purposes
QSize m_preferredSizeWhenFloating; //!< preferred size when floating 1st time
QSize m_initialDockedMinimumSize; //!< minimum size before first floating
QPoint m_offsetWhenFloating; //!< initial offset to main window when floating first time
bool m_allowStatusBar = true; bool m_allowStatusBar = true;
bool m_windowTitleWhenDocked = true; bool m_windowTitleWhenDocked = true;
bool m_wasAlreadyFloating = false; //!< flag if widget was at least once in floating state bool m_wasAlreadyFloating = false; //!< flag if widget was at least once in floating state
bool m_selected = false; //!< selected when tabbed bool m_selected = false; //!< selected when tabbed
bool m_dockWidgetVisible = false; //!< logical visible, not to be confused with QDockWidget::isVisible() bool m_dockWidgetVisible = false; //!< logical visible, not to be confused with QDockWidget::isVisible()
bool m_wasFrameless = false; //!< frameless when last floating bool m_wasFrameless = false; //!< frameless when last floating
CManagedStatusBar m_statusBar; //!< status bar when floating
QString m_windowTitleBackup; //!< original title, even if the widget title is deleted for layout purposes
QSize m_preferredSizeWhenFloating; //!< preferred size when floating 1st time
QSize m_initialDockedMinimumSize; //!< minimum size before first floating
QPoint m_offsetWhenFloating; //!< initial offset to main window when floating first time
BlackMisc::CSetting<BlackGui::Settings::TDockWidget> m_settings { this, &CDockWidget::settingsChanged }; BlackMisc::CSetting<BlackGui::Settings::TDockWidget> m_settings { this, &CDockWidget::settingsChanged };
//! Top level has been chaged //! Top level has been chaged