Skip to content

Commit 505f14a

Browse files
Improved code for generation of default configuration flags
1 parent 05c58a4 commit 505f14a

File tree

2 files changed

+18
-19
lines changed

2 files changed

+18
-19
lines changed

src/DockManager.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858

5959
namespace ads
6060
{
61-
static CDockManager::ConfigFlags StaticConfigFlags = CDockManager::DefaultConfig;
61+
static CDockManager::ConfigFlags StaticConfigFlags = CDockManager::DefaultOpaqueConfig;
6262

6363
/**
6464
* Private data class of CDockManager class (pimpl)

src/DockManager.h

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -160,25 +160,24 @@ class ADS_EXPORT CDockManager : public CDockContainerWidget
160160
DockAreaHasUndockButton = 0x4000, //!< If the flag is set each dock area has an undock button
161161
DockAreaHasTabsMenuButton = 0x8000, //!< If the flag is set each dock area has a tabs menu button
162162
DockAreaHideDisabledButtons = 0x10000, //!< If the flag is set disabled dock area buttons will not appear on the tollbar at all (enabling them will bring them back)
163-
DefaultConfig = ActiveTabHasCloseButton
164-
| DockAreaHasCloseButton
165-
| DockAreaHasUndockButton
166-
| DockAreaHasTabsMenuButton
167-
| OpaqueSplitterResize
168-
| XmlCompressionEnabled
169-
| OpaqueUndocking, ///< the default configuration
170-
DefaultNonOpaqueConfig = ActiveTabHasCloseButton
171-
| DockAreaHasCloseButton
172-
| DockAreaHasUndockButton
173-
| DockAreaHasTabsMenuButton
174-
| XmlCompressionEnabled
163+
164+
165+
DefaultDockAreaButtons = DockAreaHasCloseButton
166+
| DockAreaHasUndockButton
167+
| DockAreaHasTabsMenuButton,///< default configuration of dock area title bar buttons
168+
169+
DefaultBaseConfig = DefaultDockAreaButtons
170+
| ActiveTabHasCloseButton
171+
| XmlCompressionEnabled,///< default base configuration settings
172+
173+
DefaultOpaqueConfig = DefaultBaseConfig
174+
| OpaqueSplitterResize
175+
| OpaqueUndocking, ///< the default configuration with opaque operations - this may cause issues if ActiveX or Qt 3D windows are involved
176+
177+
DefaultNonOpaqueConfig = DefaultBaseConfig
175178
| DragPreviewShowsContentPixmap, ///< the default configuration for non opaque operations
176-
NonOpaqueWithWindowFrame = ActiveTabHasCloseButton
177-
| DockAreaHasCloseButton
178-
| DockAreaHasUndockButton
179-
| DockAreaHasTabsMenuButton
180-
| XmlCompressionEnabled
181-
| DragPreviewShowsContentPixmap
179+
180+
NonOpaqueWithWindowFrame = DefaultNonOpaqueConfig
182181
| DragPreviewHasWindowFrame ///< the default configuration for non opaque operations that show a real window with frame
183182
};
184183
Q_DECLARE_FLAGS(ConfigFlags, eConfigFlag)

0 commit comments

Comments
 (0)