Changed code to cope with a changed behavior of Qt 6.1.1. eric7

Tue, 05 Dec 2023 10:49:31 +0100

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Tue, 05 Dec 2023 10:49:31 +0100
branch
eric7
changeset 10378
cbbcecf9b25e
parent 10377
9f6ffcd1db54
child 10379
6f27d7bcfe56

Changed code to cope with a changed behavior of Qt 6.1.1.

src/eric7/Project/ProjectBrowserModel.py file | annotate | diff | comparison | revisions
src/eric7/QScintilla/EditorOutline.py file | annotate | diff | comparison | revisions
src/eric7/UI/Browser.py file | annotate | diff | comparison | revisions
src/eric7/UI/BrowserModel.py file | annotate | diff | comparison | revisions
--- a/src/eric7/Project/ProjectBrowserModel.py	Mon Dec 04 19:00:59 2023 +0100
+++ b/src/eric7/Project/ProjectBrowserModel.py	Tue Dec 05 10:49:31 2023 +0100
@@ -919,7 +919,7 @@
                     itm.setVcsStatus(self.project.vcs.vcsName())
                     index1 = self.createIndex(itm.row(), 0, itm)
                     index2 = self.createIndex(
-                        itm.row(), self.rootItem.columnCount(), itm
+                        itm.row(), self.rootItem.columnCount() - 1, itm
                     )
                     self.dataChanged.emit(index1, index2)
 
@@ -960,7 +960,7 @@
                     itm.setVcsState(state)
                     index1 = self.createIndex(itm.row(), 0, itm)
                     index2 = self.createIndex(
-                        itm.row(), self.rootItem.columnCount(), itm
+                        itm.row(), self.rootItem.columnCount() - 1, itm
                     )
                     self.dataChanged.emit(index1, index2)
             path, tail = os.path.split(path)
--- a/src/eric7/QScintilla/EditorOutline.py	Mon Dec 04 19:00:59 2023 +0100
+++ b/src/eric7/QScintilla/EditorOutline.py	Tue Dec 05 10:49:31 2023 +0100
@@ -10,7 +10,7 @@
 import contextlib
 import functools
 
-from PyQt6.QtCore import QCoreApplication, QModelIndex, QPoint, Qt, pyqtSlot
+from PyQt6.QtCore import QCoreApplication, QModelIndex, QPoint, Qt, QTimer, pyqtSlot
 from PyQt6.QtWidgets import QAbstractItemView, QApplication, QDialog, QMenu, QTreeView
 
 from eric7 import Preferences
@@ -71,12 +71,12 @@
         self.expanded.connect(self.__resizeColumns)
         self.collapsed.connect(self.__resizeColumns)
 
-        self.__resizeColumns()
-
         self.__expandedNames = []
         self.__currentItemName = ""
         self.__signalsConnected = False
 
+        QTimer.singleShot(0, self.__resizeColumns)
+
     def setActive(self, active):
         """
         Public method to activate or deactivate the outline view.
--- a/src/eric7/UI/Browser.py	Mon Dec 04 19:00:59 2023 +0100
+++ b/src/eric7/UI/Browser.py	Tue Dec 05 10:49:31 2023 +0100
@@ -16,6 +16,7 @@
     QItemSelectionModel,
     QModelIndex,
     Qt,
+    QTimer,
     QUrl,
     pyqtSignal,
     pyqtSlot,
@@ -201,7 +202,7 @@
         self.setSelectionBehavior(QAbstractItemView.SelectionBehavior.SelectRows)
 
         self.header().setStretchLastSection(True)
-        self.headerSize0 = 0
+
         self.layoutDisplay()
 
     def layoutDisplay(self):
@@ -218,10 +219,7 @@
 
         @param index index of item (QModelIndex)
         """
-        w = max(100, self.sizeHintForColumn(0))
-        if w != self.headerSize0:
-            self.header().resizeSection(0, w)
-            self.headerSize0 = w
+        self.resizeColumnToContents(0)
 
     def _resort(self):
         """
--- a/src/eric7/UI/BrowserModel.py	Mon Dec 04 19:00:59 2023 +0100
+++ b/src/eric7/UI/BrowserModel.py	Tue Dec 05 10:49:31 2023 +0100
@@ -87,7 +87,7 @@
 
         item = parent.internalPointer() if parent.isValid() else self.rootItem
 
-        return item.columnCount() + 1
+        return item.columnCount()
 
     def data(self, index, role):
         """

eric ide

mercurial