Support resizing gui font

Author: macevhicz

preditor/gui/console.py

@@ -165,6 +165,11 @@ def codeHighlighter(self):
         """
         return self._uiCodeHighlighter
 
+    def contextMenuEvent(self, event):
+        menu = self.createStandardContextMenu()
+        menu.setFont(self.window().font())
+        menu.exec(self.mapToGlobal(event.pos()))
+
     def doubleSingleShotSetScrollValue(self, origPercent):
         """This double QTimer.singleShot monkey business seems to be the only way
         to get scroll.maximum() to update properly so that we calc newValue
@@ -241,17 +246,6 @@ def mouseReleaseEvent(self, event):
         QApplication.restoreOverrideCursor()
         return super(ConsolePrEdit, self).mouseReleaseEvent(event)
 
-    def wheelEvent(self, event):
-        """Override of wheelEvent to allow for font resizing by holding ctrl while"""
-        # scrolling. If used in LoggerWindow, use that wheel event
-        # May not want to import LoggerWindow, so perhaps
-        # check by str(type())
-        ctrlPressed = event.modifiers() == Qt.KeyboardModifier.ControlModifier
-        if ctrlPressed and "LoggerWindow" in str(type(self.window())):
-            self.window().wheelEvent(event)
-        else:
-            QTextEdit.wheelEvent(self, event)
-
     def keyReleaseEvent(self, event):
         """Override of keyReleaseEvent to determine when to end navigation of
         previous commands

preditor/gui/drag_tab_bar.py

@@ -11,6 +11,7 @@
     QFileDialog,
     QInputDialog,
     QMenu,
+    QSizePolicy,
     QStyle,
     QStyleOptionTab,
     QTabBar,
@@ -353,6 +354,7 @@ def tab_menu(self, pos, popup=True):
         if self._context_menu_tab == -1:
             return
         menu = QMenu(self)
+        menu.setFont(self.window().font())
 
         grouped_tab = self.parentWidget()
         workbox = grouped_tab.widget(self._context_menu_tab)
@@ -520,6 +522,10 @@ def install_tab_widget(cls, tab_widget, mime_type='DragTabBar', menu=True):
         tab_widget.setMovable(True)
         tab_widget.setDocumentMode(True)
 
+        sizePolicy = tab_widget.sizePolicy()
+        sizePolicy.setVerticalPolicy(QSizePolicy.Policy.Preferred)
+        tab_widget.setSizePolicy(sizePolicy)
+
         if menu:
             bar.setContextMenuPolicy(Qt.ContextMenuPolicy.CustomContextMenu)
             bar.customContextMenuRequested.connect(bar.tab_menu)

preditor/gui/group_tab_widget/__init__.py

@@ -3,10 +3,8 @@
 from pathlib import Path
 
 from Qt.QtCore import Qt
-from Qt.QtGui import QIcon
-from Qt.QtWidgets import QHBoxLayout, QMessageBox, QToolButton, QWidget
+from Qt.QtWidgets import QHBoxLayout, QMessageBox, QSizePolicy, QToolButton, QWidget
 
-from ... import resourcePath
 from ...prefs import VersionTypes, get_backup_version_info
 from ..drag_tab_bar import DragTabBar
 from ..workbox_text_edit import WorkboxTextEdit
@@ -16,10 +14,10 @@
 
 DEFAULT_STYLE_SHEET = """
 /* Make the two buttons in the GroupTabWidget take up the
-   same horizontal space as the GroupedTabWidget's buttons. */
+   same horizontal space as the GroupedTabWidget's buttons.
 GroupTabWidget>QTabBar::tab{
     max-height: 1.5em;
-}
+}*/
 /* We have an icon, no need to show the menu indicator */
 #group_tab_widget_menu_btn::menu-indicator{
     width: 0px;
@@ -51,26 +49,37 @@ def __init__(self, editor_kwargs=None, core_name=None, *args, **kwargs):
         corner = QWidget(self)
         lyt = QHBoxLayout(corner)
         lyt.setSpacing(0)
-        lyt.setContentsMargins(0, 0, 0, 0)
+        lyt.setContentsMargins(0, 5, 0, 0)
 
         corner.uiNewTabBTN = QToolButton(corner)
         corner.uiNewTabBTN.setObjectName('group_tab_widget_new_btn')
         corner.uiNewTabBTN.setText('+')
-        corner.uiNewTabBTN.setIcon(QIcon(resourcePath('img/file-plus.png')))
         corner.uiNewTabBTN.released.connect(lambda: self.add_new_tab(None))
+
         lyt.addWidget(corner.uiNewTabBTN)
 
         corner.uiMenuBTN = QToolButton(corner)
-        corner.uiMenuBTN.setIcon(QIcon(resourcePath('img/chevron-down.png')))
+        corner.uiMenuBTN.setText('\u2630')
         corner.uiMenuBTN.setObjectName('group_tab_widget_menu_btn')
         corner.uiMenuBTN.setPopupMode(QToolButton.ToolButtonPopupMode.InstantPopup)
         corner.uiCornerMENU = GroupTabMenu(self, parent=corner.uiMenuBTN)
         corner.uiMenuBTN.setMenu(corner.uiCornerMENU)
+
+        self.adjustSizePolicy(corner)
+        self.adjustSizePolicy(corner.uiNewTabBTN)
+        self.adjustSizePolicy(corner.uiMenuBTN)
+        self.adjustSizePolicy(corner.uiCornerMENU)
+
         lyt.addWidget(corner.uiMenuBTN)
 
         self.uiCornerBTN = corner
         self.setCornerWidget(self.uiCornerBTN, Qt.Corner.TopRightCorner)
 
+    def adjustSizePolicy(self, button):
+        sp = button.sizePolicy()
+        sp.setVerticalPolicy(QSizePolicy.Policy.Preferred)
+        button.setSizePolicy(sp)
+
     def add_new_tab(self, group, title=None, prefs=None):
         """Adds a new tab to the requested group, creating the group if the group
         doesn't exist.
@@ -110,6 +119,7 @@ def add_new_tab(self, group, title=None, prefs=None):
         editor = parent.add_new_editor(title, prefs)
         self.setCurrentIndex(self.indexOf(parent))
         self.window().focusToWorkbox()
+        self.tabBar().setFont(self.window().font())
         return parent, editor
 
     def all_widgets(self):

preditor/gui/group_tab_widget/grouped_tab_widget.py

@@ -1,10 +1,8 @@
 from __future__ import absolute_import
 
 from Qt.QtCore import Qt
-from Qt.QtGui import QIcon
 from Qt.QtWidgets import QMessageBox, QToolButton
 
-from ... import resourcePath
 from ...prefs import VersionTypes
 from ..drag_tab_bar import DragTabBar
 from ..workbox_text_edit import WorkboxTextEdit
@@ -24,7 +22,6 @@ def __init__(self, editor_kwargs, editor_cls=None, core_name=None, *args, **kwar
 
         self.uiCornerBTN = QToolButton(self)
         self.uiCornerBTN.setText('+')
-        self.uiCornerBTN.setIcon(QIcon(resourcePath('img/file-plus.png')))
         self.uiCornerBTN.released.connect(lambda: self.add_new_editor())
         self.setCornerWidget(self.uiCornerBTN, Qt.Corner.TopRightCorner)
 

preditor/gui/group_tab_widget/one_tab_widget.py

@@ -60,6 +60,7 @@ def get_next_available_tab_name(self, name):
     def addTab(self, *args, **kwargs):  # noqa: N802
         ret = super(OneTabWidget, self).addTab(*args, **kwargs)
         self.update_closable_tabs()
+        self.tabBar().setFont(self.window().font())
         return ret
 
     def close_tab(self, index):