Gui: add dock overlay option to ignore navi cube

realthunder · May 19, 2020 · 8857204 · 8857204
1 parent e02e861
commit 8857204
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 2 deletions.
diff --git a/src/Gui/CommandView.cpp b/src/Gui/CommandView.cpp
@@ -4085,7 +4085,7 @@ VIEW_CMD_DEF(DockOverlayActivateOnHover, DockOverlayActivateOnHover)
 }
 
 //===========================================================================
-// Std_DockOverlayClickThrough
+// Std_DockOverlayMouseThrough
 //===========================================================================
 
 VIEW_CMD_DEF(DockOverlayMouseThrough, DockOverlayMouseThrough)
@@ -4098,6 +4098,23 @@ VIEW_CMD_DEF(DockOverlayMouseThrough, DockOverlayMouseThrough)
     eType         = 0;
 }
 
+//===========================================================================
+// Std_DockOverlayCheckNaviCube
+//===========================================================================
+
+VIEW_CMD_DEF(DockOverlayCheckNaviCube, DockOverlayCheckNaviCube)
+{
+    sGroup        = QT_TR_NOOP("Standard-View");
+    sMenuText     = QT_TR_NOOP("Make space for NaviCube");
+    sToolTipText  = QT_TR_NOOP("Adjust overlay size to make space for Navigation Cube\n"
+                               "Note that it only respects the cube position setting in\n"
+                               "the preference dialog, and will not work for custom\n"
+                               "position obtained through dragging the cube.");
+    sWhatsThis    = "Std_DockOverlayCheckNaviCube";
+    sStatusTip    = sToolTipText;
+    eType         = 0;
+}
+
 class StdCmdDockOverlay : public GroupCommand
 {
 public:
@@ -4127,6 +4144,7 @@ class StdCmdDockOverlay : public GroupCommand
         addCommand(new StdCmdDockOverlayExtraState());
         addCommand(new StdCmdDockOverlayActivateOnHover());
         addCommand(new StdCmdDockOverlayMouseThrough());
+        addCommand(new StdCmdDockOverlayCheckNaviCube());
     };
     virtual const char* className() const {return "StdCmdDockOverlay";}
 };

diff --git a/src/Gui/DockWindowManager.cpp b/src/Gui/DockWindowManager.cpp
@@ -1631,7 +1631,8 @@ struct DockWindowManagerP
             h -= tabbar->height();
 
         int naviCubeSize = ViewParams::getNaviWidgetSize()+10;
-        int naviCorner = ViewParams::getCornerNaviCube();
+        int naviCorner = ViewParams::getDockOverlayCheckNaviCube() ?
+            ViewParams::getCornerNaviCube() : -1;
 
         QRect rectBottom(0,0,0,0);
         if(_bottom.geometry(rectBottom)) {

diff --git a/src/Gui/ViewParams.h b/src/Gui/ViewParams.h
@@ -108,6 +108,7 @@ class GuiExport ViewParams: public ParameterGrp::ObserverType {
     FC_VIEW_PARAM(DockOverlayRevealDelay,int,Int,2000) \
     FC_VIEW_PARAM(DockOverlayActivateOnHover,bool,Bool,true) \
     FC_VIEW_PARAM(DockOverlayMouseThrough,bool,Bool,true) \
+    FC_VIEW_PARAM(DockOverlayCheckNaviCube,bool,Bool,true) \
     FC_VIEW_PARAM(EditingTransparency,double,Float,0.5) \
     FC_VIEW_PARAM(EditingAutoTransparent,bool,Bool,true) \
     FC_VIEW_PARAM(HiddenLineTransparency,double,Float,0.4) \