From 10cdb56f248b80b05a67ad674c23c2951a97e987 Mon Sep 17 00:00:00 2001 From: triplus Date: Mon, 4 Mar 2019 19:53:38 +0100 Subject: [PATCH] Add scroll area to Draft Toolbar Forum discussion: https://forum.freecadweb.org/viewtopic.php?f=3&t=34552&p=291101#p291101 issue #3881 --- src/Mod/Draft/DraftGui.py | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/src/Mod/Draft/DraftGui.py b/src/Mod/Draft/DraftGui.py index 471ffea74f..79b69bb5b8 100644 --- a/src/Mod/Draft/DraftGui.py +++ b/src/Mod/Draft/DraftGui.py @@ -388,12 +388,23 @@ class DraftToolBar: self.draftWidget = QtGui.QDockWidget() self.baseWidget = DraftDockWidget() self.draftWidget.setObjectName("draftToolbar") - self.draftWidget.setTitleBarWidget(self.baseWidget) + self.scroll = QtGui.QScrollArea() + self.scroll.setWidgetResizable(True) + self.scroll.setVerticalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOff) + self.scroll.setWidget(self.baseWidget) + self.draftWidget.setTitleBarWidget(self.scroll) + p = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/General") + size = p.GetInt("ToolbarIconSize", 24) + if size < 24: + scale = 3.5 + else: + scale = 2.5 + self.scroll.setMinimumHeight(size * scale) self.draftWidget.setWindowTitle(translate("draft", "Draft Command Bar")) self.mw = FreeCADGui.getMainWindow() self.mw.addDockWidget(QtCore.Qt.TopDockWidgetArea,self.draftWidget) self.draftWidget.setVisible(False) - self.draftWidget.toggleViewAction().setVisible(False) + self.draftWidget.toggleViewAction().setVisible(False) self.baseWidget.setObjectName("draftToolbar") self.layout = QtGui.QHBoxLayout(self.baseWidget) self.layout.setObjectName("layout") @@ -403,7 +414,7 @@ class DraftToolBar: self.setupTray() self.setupStyle() self.retranslateUi(self.baseWidget) - + #--------------------------------------------------------------------------- # General UI setup #---------------------------------------------------------------------------