fix(ui): resolve layout issues during search filtering

Signed-off-by: Boris Yumankulov <boria138@altlinux.org>

.gitea/workflows/build-nightlly.yml

@@ -94,7 +94,7 @@ jobs:
     name: Build Arch Package
     runs-on: ubuntu-22.04
     container:
-      image: archlinux:base-devel@sha256:5d95edcb6e10fd865e827e93749ecd425f5056880a5a1d8971f5f2a96c7b5a9a
+      image: archlinux:base-devel@sha256:b3809917ab5a7840d42237f5f92d92660cd036bd75ae343e7825e6a24401f166
       volumes:
         - /usr:/usr-host
         - /opt:/opt-host

.gitea/workflows/code-build.yml

@@ -138,7 +138,7 @@ jobs:
     needs: changes
     if: needs.changes.outputs.arch == 'true' || github.event_name == 'workflow_dispatch'
     container:
-      image: archlinux:base-devel@sha256:5d95edcb6e10fd865e827e93749ecd425f5056880a5a1d8971f5f2a96c7b5a9a
+      image: archlinux:base-devel@sha256:b3809917ab5a7840d42237f5f92d92660cd036bd75ae343e7825e6a24401f166
       volumes:
         - /usr:/usr-host
         - /opt:/opt-host

CHANGELOG.md

@@ -20,6 +20,7 @@
 - Исправлено зависание при добавлении или удалении игры в Wayland
 - Исправлено зависание при поиске игр
 - Исправлено ошибочное присвоение ID игры с названием "GAME", возникавшее, если исполняемый файл находился в подпапке `game/` (часто встречается у игр на Unity)
+- Исправлена ошибка из-за которой подсказки по управлению снизу и сверху могли не совпадать с друг другом, из-за чего возле вкладок были стрелки клавиатуры, а снизу кнопки геймпада
 
 ### Contributors
 

build-aux/AppImageBuilder.yml

@@ -54,6 +54,11 @@ AppDir:
       - libxcb-cursor0
       - libimage-exiftool-perl
       - xdg-utils
+      - cabextract
+      - curl
+      - 7zip
+      - unzip
+      - unrar
     exclude:
       - "*-doc"
       - "*-man"

build-aux/PKGBUILD

@@ -6,7 +6,7 @@ arch=('any')
 url="https://git.linux-gaming.ru/Boria138/PortProtonQt"
 license=('GPL-3.0')
 depends=('python-numpy' 'python-requests' 'python-babel' 'python-evdev' 'python-pyudev' 'python-orjson'
-    'python-psutil' 'python-tqdm' 'python-vdf' 'pyside6' 'icoextract' 'python-pillow' 'perl-image-exiftool' 'xdg-utils' 'python-beautifulsoup4' 'python-websocket-client')
+    'python-psutil' 'python-tqdm' 'python-vdf' 'pyside6' 'icoextract' 'python-pillow' 'perl-image-exiftool' 'xdg-utils' 'python-beautifulsoup4' 'python-websocket-client' 'cabextract' 'unzip' 'curl' 'unrar')
 makedepends=('python-'{'build','installer','setuptools','wheel'})
 source=("git+https://git.linux-gaming.ru/Boria138/PortProtonQt#tag=v$pkgver")
 sha256sums=('SKIP')

build-aux/PKGBUILD-git

@@ -6,7 +6,7 @@ arch=('any')
 url="https://git.linux-gaming.ru/Boria138/PortProtonQt"
 license=('GPL-3.0')
 depends=('python-numpy' 'python-requests' 'python-babel' 'python-evdev' 'python-pyudev' 'python-orjson'
-    'python-psutil' 'python-tqdm' 'python-vdf' 'pyside6' 'icoextract' 'python-pillow' 'perl-image-exiftool' 'xdg-utils' 'python-beautifulsoup4' 'python-websocket-client')
+    'python-psutil' 'python-tqdm' 'python-vdf' 'pyside6' 'icoextract' 'python-pillow' 'perl-image-exiftool' 'xdg-utils' 'python-beautifulsoup4' 'python-websocket-client' 'cabextract' 'unzip' 'curl' 'unrar')
 makedepends=('python-'{'build','installer','setuptools','wheel'})
 source=("git+https://git.linux-gaming.ru/Boria138/PortProtonQt.git")
 sha256sums=('SKIP')

build-aux/fedora-git.spec

@@ -46,6 +46,11 @@ Requires:       python3-pillow
 Requires:       perl-Image-ExifTool
 Requires:       xdg-utils
 Requires:       python3-beautifulsoup4
+Requires:       cabextract
+Requires:       gzip
+Requires:       unzip
+Requires:       curl
+Requires:       unrar
 
 %description -n python3-%{pypi_name}-git
 This application provides a sleek, intuitive graphical interface for managing and launching games from PortProton, Steam, and Epic Games Store. It consolidates your game libraries into a single, user-friendly hub for seamless navigation and organization. Its lightweight structure and cross-platform support deliver a cohesive gaming experience, eliminating the need for multiple launchers. Unique PortProton integration enhances Linux gaming, enabling effortless play of Windows-based titles with minimal setup.

build-aux/fedora.spec

@@ -43,6 +43,11 @@ Requires:       python3-pillow
 Requires:       perl-Image-ExifTool
 Requires:       xdg-utils
 Requires:       python3-beautifulsoup4
+Requires:       cabextract
+Requires:       gzip
+Requires:       unzip
+Requires:       curl
+Requires:       unrar
 
 %description -n python3-%{pypi_name}
 This application provides a sleek, intuitive graphical interface for managing and launching games from PortProton, Steam, and Epic Games Store. It consolidates your game libraries into a single, user-friendly hub for seamless navigation and organization. Its lightweight structure and cross-platform support deliver a cohesive gaming experience, eliminating the need for multiple launchers. Unique PortProton integration enhances Linux gaming, enabling effortless play of Windows-based titles with minimal setup.

portprotonqt/custom_widgets.py

@@ -126,7 +126,21 @@ class FlowLayout(QLayout):
         return True
 
     def heightForWidth(self, width):
-        return self.doLayout(QRect(0, 0, width, 0), True)
+        # Аналогично фильтруем видимые для тестового расчёта высоты
+        visible_items = []
+        nat_sizes = np.empty((0, 2), dtype=np.int32)
+        for item in self.itemList:
+            if item.widget() and item.widget().isVisible():
+                visible_items.append(item)
+                s = item.sizeHint()
+                new_row = np.array([[s.width(), s.height()]], dtype=np.int32)
+                nat_sizes = np.vstack([nat_sizes, new_row]) if len(nat_sizes) > 0 else new_row
+
+        if len(visible_items) == 0:
+            return 0
+
+        _, total_height = compute_layout(nat_sizes, width, self._spacing, self._max_scale)
+        return total_height
 
     def setGeometry(self, rect):
         super().setGeometry(rect)
@@ -145,26 +159,46 @@ class FlowLayout(QLayout):
         return size
 
     def doLayout(self, rect, testOnly):
-        N = len(self.itemList)
-        if N == 0:
+        N_total = len(self.itemList)
+        if N_total == 0:
             return 0
 
-        nat_sizes = np.empty((N, 2), dtype=np.int32)
+        # Фильтруем только видимые элементы
+        visible_items = []
+        visible_indices = []  # Индексы в оригинальном itemList для установки геометрии
+        nat_sizes = np.empty((0, 2), dtype=np.int32)
         for i, item in enumerate(self.itemList):
-            s = item.sizeHint()
-            nat_sizes[i, 0] = s.width()
-            nat_sizes[i, 1] = s.height()
+            if item.widget() and item.widget().isVisible():
+                visible_items.append(item)
+                visible_indices.append(i)
+                s = item.sizeHint()
+                new_row = np.array([[s.width(), s.height()]], dtype=np.int32)
+                nat_sizes = np.vstack([nat_sizes, new_row]) if len(nat_sizes) > 0 else new_row
+
+        N = len(visible_items)
+        if N == 0:
+            # Если все скрыты, устанавливаем нулевые геометрии для всех
+            if not testOnly:
+                for item in self.itemList:
+                    item.setGeometry(QRect())
+            return 0
 
         geom_array, total_height = compute_layout(nat_sizes, rect.width(), self._spacing, self._max_scale)
 
         if not testOnly:
-            for i, item in enumerate(self.itemList):
-                x = geom_array[i, 0] + rect.x()
-                y = geom_array[i, 1] + rect.y()
-                w = geom_array[i, 2]
-                h = geom_array[i, 3]
+            # Устанавливаем геометрии только для видимых
+            for idx, (_vis_idx, item) in enumerate(zip(visible_indices, visible_items, strict=True)):
+                x = geom_array[idx, 0] + rect.x()
+                y = geom_array[idx, 1] + rect.y()
+                w = geom_array[idx, 2]
+                h = geom_array[idx, 3]
                 item.setGeometry(QRect(QPoint(x, y), QSize(w, h)))
 
+            # Для невидимых — нулевая геометрия
+            for i in range(N_total):
+                if i not in visible_indices:
+                    self.itemList[i].setGeometry(QRect())
+
         return total_height
 
 class ClickableLabel(QLabel):

portprotonqt/dialogs.py

@@ -510,8 +510,8 @@ class FileExplorer(QDialog):
         """Update the list of mounted drives and favorite folders."""
         for i in reversed(range(self.drives_layout.count())):
             item = self.drives_layout.itemAt(i)
-            if item and item.widget():
-                widget = item.widget()
+            widget = item.widget() if item else None
+            if widget:
                 self.drives_layout.removeWidget(widget)
                 widget.deleteLater()
 
@@ -1233,6 +1233,7 @@ class WinetricksDialog(QDialog):
         assert self.prefix_path is not None
         env = QProcessEnvironment.systemEnvironment()
         env.insert("WINEPREFIX", self.prefix_path)
+        env.insert("WINETRICKS_DOWNLOADER", "curl")
         if self.wine_use is not None:
             env.insert("WINE", self.wine_use)
 

portprotonqt/game_card.py

@@ -12,6 +12,7 @@ from portprotonqt.downloader import Downloader
 from portprotonqt.animations import GameCardAnimations
 from typing import cast
 
+
 class GameCard(QFrame):
     borderWidthChanged = Signal()
     gradientAngleChanged = Signal()
@@ -447,6 +448,7 @@ class GameCard(QFrame):
     gradientAngle = Property(float, getGradientAngle, setGradientAngle, None, "", notify=cast(Callable[[], None], gradientAngleChanged))
     scale = Property(float, getScale, setScale, None, "", notify=cast(Callable[[], None], scaleChanged))
 
+
     def paintEvent(self, event):
         super().paintEvent(event)
         self.animations.paint_border(QPainter(self))

portprotonqt/game_library_manager.py

@@ -363,8 +363,9 @@ class GameLibraryManager:
                     cover_path, width, height, callback = self.pending_images.pop(game_key)
                     load_pixmap_async(cover_path, width, height, callback)
 
-        # Force geometry update so FlowLayout accounts for hidden widgets
+        # Force full relayout after visibility changes
         if self.gamesListLayout is not None:
+            self.gamesListLayout.invalidate()  # Принудительно инвалидируем для пересчёта
             self.gamesListLayout.update()
         if self.gamesListWidget is not None:
             self.gamesListWidget.updateGeometry()

portprotonqt/main_window.py

@@ -206,6 +206,8 @@ class MainWindow(QMainWindow):
         self.controlHintsWidget = self.createControlHintsWidget()
         mainLayout.addWidget(self.controlHintsWidget)
 
+        self.updateControlHints()
+
         self.restore_state()
 
         self.detail_animations = DetailPageAnimations(self, self.theme)
@@ -430,6 +432,7 @@ class MainWindow(QMainWindow):
         # Update navigation buttons
         self.updateNavButtons()
 
+
     @Slot(list)
     def on_games_loaded(self, games: list[tuple]):
         self.game_library_manager.set_games(games)
@@ -2066,10 +2069,19 @@ class MainWindow(QMainWindow):
                 completionist_time = hltb.format_game_time(game, "completionist")
 
                 # Очищаем layout перед добавлением новых элементов
-                while hltbLayout.count():
-                    child = hltbLayout.takeAt(0)
-                    if child.widget():
-                        child.widget().deleteLater()
+                def clear_layout(layout):
+                    while layout.count():
+                        item = layout.takeAt(0)
+                        widget = item.widget()
+                        sublayout = item.layout()
+                        if widget:
+                            widget.deleteLater()
+                        elif sublayout:
+                            clear_layout(sublayout)
+
+                clear_layout(hltbLayout)
+
+
 
                 has_data = False
 
@@ -2537,7 +2549,7 @@ class MainWindow(QMainWindow):
                 self.settingsDebounceTimer.stop()
             if hasattr(self, 'searchDebounceTimer') and self.searchDebounceTimer.isActive():
                 self.searchDebounceTimer.stop()
-            if hasattr(self, 'checkProcessTimer') and self.checkProcessTimer and self.checkProcessTimer.isActive():
+            if hasattr(self, 'checkProcessTimer') and self.checkProcessTimer is not None and self.checkProcessTimer.isActive():
                 self.checkProcessTimer.stop()
                 self.checkProcessTimer.deleteLater()
                 self.checkProcessTimer = None

pyproject.toml

@@ -27,19 +27,19 @@ classifiers = [
 requires-python = ">=3.10"
 dependencies = [
     "babel>=2.17.0",
-    "beautifulsoup4>=4.13.5",
+    "beautifulsoup4>=4.14.2",
     "evdev>=1.9.2",
     "icoextract>=0.2.0",
     "numpy>=2.2.4",
-    "orjson>=3.11.2",
+    "orjson>=3.11.3",
     "pillow>=11.3.0",
-    "psutil>=7.0.0",
-    "pyside6>=6.9.1",
+    "psutil>=7.1.0",
+    "pyside6==6.9.1",
     "pyudev>=0.24.3",
     "requests>=2.32.5",
     "tqdm>=4.67.1",
     "vdf>=3.4",
-    "websocket-client>=1.8.0",
+    "websocket-client>=1.9.0",
 ]
 
 [project.scripts]
@@ -105,5 +105,5 @@ ignore = [
 dev = [
     "pre-commit>=4.3.0",
     "pyaspeller>=2.0.2",
-    "pyright>=1.1.404",
+    "pyright>=1.1.406",
 ]

renovate.json

@@ -1,6 +1,8 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "extends": ["config:best-practices"],
+  "extends": [
+    "config:best-practices"
+  ],
   "rebaseWhen": "never",
   "lockFileMaintenance": {
     "enabled": true
@@ -9,6 +11,23 @@
     "enabled": true
   },
   "packageRules": [
+    {
+      "description": "Update renovate only weekly",
+      "matchDepNames": ["ghcr.io/renovatebot/renovate"],
+      "extends": ["schedule:weekly"]
+    },
+    {
+      "description": "Automerge renovate updates",
+      "matchPackageNames": [
+        "ghcr.io/renovatebot/renovate"
+      ],
+      "matchUpdateTypes": [
+        "minor",
+        "patch",
+        "digest"
+      ],
+      "automerge": true
+    },
     {
       "matchUpdateTypes": ["minor", "patch"],
       "automerge": true
@@ -33,7 +52,7 @@
       "groupName": "Python dependencies"
     },
     {
-      "matchPackageNames": ["numpy", "setuptools", "python"],
+      "matchPackageNames": ["numpy", "setuptools", "python", "pyside6"],
       "enabled": false,
       "description": "Disabled due to Python 3.10 incompatibility with numpy>=2.3.2 (requires Python>=3.11)"
     },