pygpt-net 2.7.2__py3-none-any.whl → 2.7.4__py3-none-any.whl

pygpt_net/ui/layout/chat/input.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.09.03 00:00:00                  #
+# Updated Date: 2025.12.31 16:00:00                  #
 # ================================================== #
 
 from functools import partial
@@ -26,6 +26,7 @@ from pygpt_net.ui.widget.audio.input_button import AudioInputButton
 from pygpt_net.ui.widget.element.labels import HelpLabel
 from pygpt_net.ui.widget.tabs.Input import InputTabs
 from pygpt_net.ui.widget.textarea.input import ChatInput
+from pygpt_net.ui.widget.textarea.input_extra import ExtraInput
 from pygpt_net.utils import trans
 
 
@@ -55,6 +56,7 @@ class Input:
         :return: QWidget
         """
         input = self.setup_input()
+        input_extra = self.setup_input_extra()
         files = self.setup_attachments()
         files_uploaded = self.setup_attachments_uploaded()
         files_ctx = self.setup_attachments_ctx()
@@ -66,6 +68,7 @@ class Input:
         tabs.addTab(files, trans('attachments.tab'))
         tabs.addTab(files_uploaded, trans('attachments_uploaded.tab'))
         tabs.addTab(files_ctx, trans('attachments_uploaded.tab'))
+        tabs.addTab(input_extra, trans('input.tab.extra'))
         tabs.currentChanged.connect(self.update_min_height)
 
         tabs.setTabIcon(0, QIcon(":/icons/input.svg"))
@@ -97,6 +100,21 @@ class Input:
         layout.setContentsMargins(0, 0, 0, 0)
         return widget
 
+    def setup_input_extra(self) -> QWidget:
+        """
+        Setup input tab (extra)
+
+        :return: QWidget
+        """
+        self.window.ui.nodes['input_extra'] = ExtraInput(self.window)
+        self.window.ui.nodes['input_extra'].setMinimumHeight(self.min_height_input)
+
+        widget = QWidget()
+        layout = QVBoxLayout(widget)
+        layout.addWidget(self.window.ui.nodes['input_extra'])
+        layout.setContentsMargins(0, 0, 0, 0)
+        return widget
+
     def setup_attachments(self) -> QWidget:
         """
         Setup attachments
@@ -245,7 +263,7 @@ class Input:
         controller_ui = self.window.controller.ui
 
         idx = tabs.currentIndex()
-        if idx == 0:
+        if idx == 0 or idx == 4:
             # nodes['input'].setMinimumHeight(self.min_height_input)
             tabs.setMinimumHeight(self.min_height_input_tab)
             sizes = controller_ui.splitter_output_size_input

pygpt_net/ui/layout/chat/painter.py

@@ -15,6 +15,7 @@ from PySide6.QtCore import QSize
 
 from pygpt_net.ui.widget.draw.painter import PainterWidget
 from pygpt_net.ui.widget.element.labels import HelpLabel
+from pygpt_net.ui.widget.option.combo import NoScrollCombo
 from pygpt_net.utils import trans
 
 
@@ -57,7 +58,7 @@ class Painter:
         key = 'painter.select.brush.size'
         if nodes.get(key) is None:
             sizes = common.get_sizes()
-            cb = QComboBox()
+            cb = NoScrollCombo(self.window)
             cb.addItems(sizes)
             cb.currentTextChanged.connect(common.change_brush_size)
             cb.setMinimumContentsLength(10)
@@ -67,7 +68,7 @@ class Painter:
         key = 'painter.select.canvas.size'
         if nodes.get(key) is None:
             canvas_sizes = common.get_canvas_sizes()
-            cb = QComboBox()
+            cb = NoScrollCombo(self.window)
             cb.addItems(canvas_sizes)
             cb.setMinimumContentsLength(20)
             cb.setSizeAdjustPolicy(QComboBox.AdjustToContents)
@@ -76,7 +77,7 @@ class Painter:
 
         key = 'painter.select.brush.color'
         if nodes.get(key) is None:
-            cb = QComboBox()
+            cb = NoScrollCombo(self.window)
             cb.setIconSize(QSize(16, 16))
             colors = common.get_colors()
             for color_name, color_value in colors.items():
@@ -86,13 +87,14 @@ class Painter:
                 cb.addItem(icon, color_name, color_value)
             cb.currentTextChanged.connect(common.change_brush_color)
             cb.setMinimumContentsLength(10)
+            cb.setMinimumWidth(205)
             cb.setSizeAdjustPolicy(QComboBox.AdjustToContents)
             nodes[key] = cb
 
             # Zoom combo (view-only scale) placed to the right of canvas size
             key = 'painter.select.zoom'
             if nodes.get(key) is None:
-                cb = QComboBox()
+                cb = NoScrollCombo(self.window)
                 cb.setMinimumContentsLength(8)
                 cb.setSizeAdjustPolicy(QComboBox.AdjustToContents)
 

pygpt_net/ui/layout/toolbox/image.py

@@ -6,13 +6,15 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.12.28 18:00:00                  #
+# Updated Date: 2025.12.30 22:00:00                  #
 # ================================================== #
 
-from PySide6.QtWidgets import QVBoxLayout, QWidget
+from PySide6.QtWidgets import QVBoxLayout, QWidget, QHBoxLayout
 
 from pygpt_net.ui.widget.option.combo import OptionCombo
-from pygpt_net.ui.widget.option.slider import OptionSlider
+from pygpt_net.ui.widget.option.input import OptionInput
+from pygpt_net.ui.widget.option.toggle_label import ToggleLabel
+from pygpt_net.utils import trans
 
 
 class Image:
@@ -33,33 +35,41 @@ class Image:
         """
         option = {
             "type": "int",
-            "slider": True,
             "label": "img_variants",
             "min": 1,
             "max": 4,
-            "step": 1,
             "value": 1,
-            "multiplier": 1,
         }
 
         ui = self.window.ui
         conf_global = ui.config['global']
 
-        container = QWidget()
+        container = QWidget(parent=self.window)
         ui.nodes['dalle.options'] = container
 
-        conf_global['img_variants'] = OptionSlider(self.window, 'global', 'img_variants', option)
+        conf_global['img_variants'] = OptionInput(self.window, 'global', 'img_variants', option)
+        conf_global['img_variants'].setToolTip(trans("toolbox.img_variants.label"))
 
         option_resolutions = self.window.core.image.get_resolution_option()
         conf_global['img_resolution'] = OptionCombo(self.window, 'global', 'img_resolution', option_resolutions)
         conf_global['img_resolution'].setMinimumWidth(160)
 
+        conf_global['img.remix'] = ToggleLabel(trans("img.remix"), parent=self.window)
+        conf_global['img.remix'].box.setToolTip(trans("img.remix.tooltip"))
+        conf_global['img.remix'].box.toggled.connect(self.window.controller.media.toggle_remix_image)
+
+        cols = QHBoxLayout()
+        cols.addWidget(conf_global['img_resolution'], 3)
+        cols.addWidget(conf_global['img_variants'], 1)
+        cols.setContentsMargins(2, 5, 5, 5)
+
         rows = QVBoxLayout()
-        rows.addWidget(conf_global['img_variants'])
-        rows.addWidget(conf_global['img_resolution'])
+        rows.addLayout(cols)
+        rows.addWidget(conf_global['img.remix'])
         rows.setContentsMargins(2, 5, 5, 5)
 
         container.setLayout(rows)
-        container.setContentsMargins(2, 0, 0, 0)
+        container.setContentsMargins(2, 0, 0, 10)
+        container.setFixedHeight(100)
 
         return container

pygpt_net/ui/layout/toolbox/raw.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.12.25 20:00:00                  #
+# Updated Date: 2025.12.30 22:00:00                  #
 # ================================================== #
 
 from PySide6.QtWidgets import QVBoxLayout, QHBoxLayout, QWidget, QCheckBox
@@ -34,7 +34,7 @@ class Raw:
         ui = self.window.ui
         conf_global = ui.config['global']
 
-        container = QWidget()
+        container = QWidget(parent=self.window)
         ui.nodes['media.raw'] = container
 
         conf_global['img_raw'] = QCheckBox(trans("img.raw"), parent=container)

pygpt_net/ui/layout/toolbox/video.py

@@ -6,13 +6,15 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.12.28 18:00:00                  #
+# Updated Date: 2025.12.30 22:00:00                  #
 # ================================================== #
 
-from PySide6.QtWidgets import QWidget, QHBoxLayout
+from PySide6.QtWidgets import QWidget, QHBoxLayout, QVBoxLayout
 
 from pygpt_net.ui.widget.option.combo import OptionCombo
 from pygpt_net.ui.widget.option.input import OptionInput
+from pygpt_net.ui.widget.option.toggle_label import ToggleLabel
+from pygpt_net.utils import trans
 
 
 class Video:
@@ -34,7 +36,7 @@ class Video:
         ui = self.window.ui
         conf_global = ui.config['global']
 
-        container = QWidget()
+        container = QWidget(parent=self.window)
         ui.nodes['video.options'] = container
 
         option_ratio = self.window.core.video.get_aspect_ratio_option()
@@ -44,18 +46,29 @@ class Video:
         conf_global['video.aspect_ratio'] = OptionCombo(self.window, 'global', 'video.aspect_ratio', option_ratio)
         conf_global['video.resolution'] = OptionCombo(self.window, 'global', 'video.resolution', option_resolution)
         conf_global['video.duration'] = OptionInput(self.window, 'global', 'video.duration', option_duration)
+        conf_global['video.duration'].setToolTip(trans('settings.video.duration.desc'))
 
         conf_global['video.aspect_ratio'].setMinimumWidth(120)
         conf_global['video.resolution'].setMinimumWidth(120)
         conf_global['video.duration'].setMinimumWidth(50)
 
-        rows = QHBoxLayout()
-        rows.addWidget(conf_global['video.resolution'], 2)
-        rows.addWidget(conf_global['video.aspect_ratio'], 2)
-        rows.addWidget(conf_global['video.duration'], 1)
-        rows.setContentsMargins(2, 5, 5, 5)
+        conf_global['video.remix'] = ToggleLabel(trans("video.remix"), parent=self.window)
+        conf_global['video.remix'].box.setToolTip(trans("video.remix.tooltip"))
+        conf_global['video.remix'].box.toggled.connect(self.window.controller.media.toggle_remix_video)
+
+        cols = QHBoxLayout()
+        cols.addWidget(conf_global['video.resolution'], 2)
+        cols.addWidget(conf_global['video.aspect_ratio'], 2)
+        cols.addWidget(conf_global['video.duration'], 1)
+        cols.setContentsMargins(2, 5, 5, 5)
+
+        rows = QVBoxLayout()
+        rows.addLayout(cols)
+        rows.addWidget(conf_global['video.remix'])
+        rows.setContentsMargins(0, 0, 0, 0)
 
         container.setLayout(rows)
-        container.setContentsMargins(2, 0, 0, 0)
+        container.setContentsMargins(2, 0, 0, 10)
+        container.setFixedHeight(90)
 
         return container

pygpt_net/ui/main.py

@@ -6,13 +6,13 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.12.28 00:00:00                  #
+# Updated Date: 2025.12.31 14:00:00                  #
 # ================================================== #
 
 import os
 
 from PySide6.QtCore import QTimer, Signal, Slot, QThreadPool, QEvent, Qt, QLoggingCategory, QEventLoop
-from PySide6.QtGui import QShortcut, QKeySequence
+from PySide6.QtGui import QShortcut, QKeySequence, QKeyEvent
 from PySide6.QtWidgets import QMainWindow, QApplication
 from qt_material import QtStyleTools
 
@@ -37,6 +37,7 @@ class MainWindow(QMainWindow, QtStyleTools):
     stateChanged = Signal(str)
     logger_message = Signal(object)
     idx_logger_message = Signal(object)
+    appReady = Signal()  # emitted after the first paint to indicate the window is ready on screen
 
     def __init__(self, app: QApplication, args: dict = None):
         """
@@ -61,6 +62,9 @@ class MainWindow(QMainWindow, QtStyleTools):
         self.prevState = None
         self.is_post_update = False
 
+        # app ready emission control
+        self._app_ready_emitted = False  # ensures single-shot emission
+
         # load version info
         self.meta = get_app_meta()
 
@@ -92,6 +96,7 @@ class MainWindow(QMainWindow, QtStyleTools):
 
         # global shortcuts
         self.shortcuts = []
+        self._esc_shortcut = None  # keep a direct handle to temporarily disable during rerouting
 
         # setup signals
         self.statusChanged.connect(self.update_status)
@@ -231,6 +236,18 @@ class MainWindow(QMainWindow, QtStyleTools):
         super().showEvent(e)
         QTimer.singleShot(0, self.ui.on_show)
 
+    def paintEvent(self, e):
+        """
+        On the first paint, announce that the window is actually visible and ready.
+        This is used to synchronize closing the external splash screen.
+        """
+        super().paintEvent(e)
+        if not self._app_ready_emitted:
+            self._app_ready_emitted = True
+            QTimer.singleShot(0, self.appReady.emit)
+            # set focus to main window after shown
+            QTimer.singleShot(0, self.activateWindow)
+
     def update(self):
         """Called on every update (real-time)"""
         # self.controller.on_update()
@@ -404,6 +421,67 @@ class MainWindow(QMainWindow, QtStyleTools):
         self.activateWindow()
         self.ui.tray_menu['restore'].setVisible(False)
 
+    # ----- Global ESC routing that preserves widget-level ESC handling -----
+
+    def _deliver_escape_to(self, target) -> bool:
+        """
+        Synthesize ESC keypress to the focused/popup widget so it can run its own close logic.
+        Temporarily disables the global ESC shortcut to avoid re-triggering itself.
+        """
+        if target is None or not target.isVisible():
+            return False
+        try:
+            if self._esc_shortcut is not None:
+                self._esc_shortcut.setEnabled(False)
+            press = QKeyEvent(QEvent.KeyPress, Qt.Key_Escape, Qt.NoModifier)
+            release = QKeyEvent(QEvent.KeyRelease, Qt.Key_Escape, Qt.NoModifier)
+            QApplication.sendEvent(target, press)
+            QApplication.sendEvent(target, release)
+        except Exception:
+            pass
+        finally:
+            if self._esc_shortcut is not None:
+                QTimer.singleShot(0, lambda: self._esc_shortcut.setEnabled(True))
+        return True
+
+    def _route_escape_to_focus_or_popup(self) -> bool:
+        """
+        Route ESC to the widget that currently owns focus (prefer) or active popup widget.
+        Returns True when ESC was delivered to a target.
+        """
+        popup = QApplication.activePopupWidget()
+        if popup is not None and popup.isVisible():
+            try:
+                fw = QApplication.focusWidget()
+                if self._deliver_escape_to(fw):
+                    return True
+            except Exception:
+                pass
+            return True
+
+        modal = QApplication.activeModalWidget()
+        if modal is not None and modal.isVisible():
+            try:
+                modal.close()
+            except Exception:
+                pass
+            return True
+
+        # No popup or modal to close
+        return False
+
+    def _on_escape_shortcut(self):
+        """
+        Global ESC: deliver ESC to the focused/popup widget first so it can handle and cleanup correctly.
+        If nothing handles it, run the app-level escape handler.
+        """
+        if self._route_escape_to_focus_or_popup():
+            return
+        try:
+            self.controller.access.on_escape()
+        except Exception:
+            pass
+
     def setup_global_shortcuts(self):
         """Setup global shortcuts"""
         if not hasattr(self, 'core') or not hasattr(self.core, 'config'):
@@ -417,12 +495,15 @@ class MainWindow(QMainWindow, QtStyleTools):
             self.shortcuts.clear()
         else:
             self.shortcuts = []
+        self._esc_shortcut = None
 
         # Handle the Escape key
         escape_shortcut = QShortcut(QKeySequence(Qt.Key_Escape), self)
         escape_shortcut.setContext(Qt.ApplicationShortcut)
-        escape_shortcut.activated.connect(self.controller.access.on_escape)
+        # escape_shortcut.setAutoRepeat(False)  # avoid spamming when holding the key
+        escape_shortcut.activated.connect(self._on_escape_shortcut)
         self.shortcuts.append(escape_shortcut)
+        self._esc_shortcut = escape_shortcut
 
         config = self.core.config.get("access.shortcuts")
         if config is None:

pygpt_net/ui/widget/dialog/base.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.08.24 23:00:00                  #
+# Updated Date: 2025.12.31 14:00:00                  #
 # ================================================== #
 
 from PySide6.QtWidgets import QApplication
@@ -75,9 +75,8 @@ class BaseDialog(QDialog):
             "size": [self.size().width(), self.size().height()],
             "pos": [self.pos().x(), self.pos().y()]
         }
+        data = {}
         if self.store_geometry_enabled():
-            data = config.get("layout.dialog.geometry", {})
-        else:
             data = config.get_session("layout.dialog.geometry", {})
 
         if not isinstance(data, dict):
@@ -85,8 +84,6 @@ class BaseDialog(QDialog):
         data[self.id] = item
 
         if self.store_geometry_enabled():
-            config.set("layout.dialog.geometry", data)
-        else:
             config.set_session("layout.dialog.geometry", data)
 
     def restore_geometry(self):
@@ -96,14 +93,10 @@ class BaseDialog(QDialog):
         available_geometry = screen.availableGeometry()
         config = self.window.core.config
 
+        data = {}
         if self.store_geometry_enabled():
-            data = config.get("layout.dialog.geometry", {})
-        else:
             data = config.get_session("layout.dialog.geometry", {})
 
-        if not isinstance(data, dict):
-            data = {}
-
         item = data.get(self.id, {})
         if isinstance(item, dict) and "size" in item and "pos" in item:
             width, height = item["size"]

pygpt_net/ui/widget/option/combo.py

@@ -8,6 +8,7 @@
 # Created By  : Marcin Szczygliński                  #
 # Updated Date: 2025.12.28 00:00:00                  #
 # ================================================== #
+import sys
 
 from PySide6.QtCore import Qt, QEvent, QTimer, QRect, Property
 from PySide6.QtWidgets import (
@@ -21,12 +22,13 @@ from PySide6.QtWidgets import (
     QListView,
     QStyledItemDelegate,
     QStyleOptionViewItem,
+    QApplication,
 )
 from PySide6.QtGui import (
     QFontMetrics,
     QStandardItem,
     QStandardItemModel,
-    QIcon,  # keep existing imports, extend with items
+    QIcon,
     QColor,
     QPainter,
     QPen,
@@ -399,6 +401,9 @@ class SearchableCombo(SeparatorComboBox):
         self._swallow_release_once: bool = False  # kept for compatibility; not used in the new flow
         self._open_on_release: bool = False       # open popup on mouse release (non-arrow path)
 
+        # One-shot guard to ignore replayed click when user closes popup by clicking this same combo
+        self._prevent_reopen_once: bool = False
+
         # Popup fitting helpers
         self._fit_in_progress: bool = False
         self._popup_parent_window = None
@@ -508,6 +513,11 @@ class SearchableCombo(SeparatorComboBox):
         QTimer.singleShot(0, self._fit_popup_to_window)
         self._refresh_popup_view()
 
+        # Minimal robustness: re-ensure header after popup is fully shown (helps on Windows when switching combos)
+        QTimer.singleShot(0, self._ensure_header_after_show)
+        QTimer.singleShot(15, self._ensure_header_after_show)
+        QTimer.singleShot(60, self._ensure_header_after_show)
+
     def hidePopup(self):
         """Close popup and restore normal display text; remove header/margins."""
         super().hidePopup()
@@ -673,6 +683,12 @@ class SearchableCombo(SeparatorComboBox):
         Use release-to-open on the non-arrow area to avoid immediate close when the popup opens upward.
         Keep the arrow area with the default toggle behaviour from the base class.
         """
+        # One-shot guard: if popup was closed by clicking this same combo, ignore the replayed click
+        if event.button() == Qt.LeftButton and self._prevent_reopen_once:
+            self._prevent_reopen_once = False
+            event.accept()
+            return
+
         if event.button() == Qt.LeftButton and self.isEnabled():
             arrow_rect = self._arrow_rect()
             if arrow_rect.contains(event.pos()):
@@ -722,6 +738,8 @@ class SearchableCombo(SeparatorComboBox):
                 event.accept()
                 return
             if event.key() == Qt.Key_Escape:
+                # Explicitly close so the next click opens immediately
+                self.hidePopup()
                 event.accept()
                 return
         super().keyPressEvent(event)
@@ -737,6 +755,53 @@ class SearchableCombo(SeparatorComboBox):
         - Keep popup horizontally inside the parent window while resizing/moving.
         """
         if obj is self._popup_container and self._popup_container is not None:
+            # Open target combo immediately when user clicks outside current popup
+            if event.type() == QEvent.MouseButtonPress:
+                try:
+                    # Detect left-click outside popup window
+                    left_btn = (getattr(event, "button", lambda: None)() == Qt.LeftButton)
+                    pos_local = getattr(event, "position", lambda: None)()
+                    inside = self._popup_container.rect().contains(pos_local.toPoint()) if pos_local is not None else True
+                    if left_btn and not inside:
+                        # Find widget under cursor and see if it's a different combo
+                        gp = getattr(event, "globalPosition", None)
+                        gp_pt = gp().toPoint() if callable(gp) else getattr(event, "globalPos", lambda: None)()
+                        if gp_pt is None:
+                            gp_pt = QApplication.instance().cursor().pos() if QApplication.instance() else None
+                        target = QApplication.widgetAt(gp_pt) if gp_pt is not None else None
+                        target_combo = self._ascend_to_combo(target)
+                        if target_combo is self:
+                            # Clicked back on the owner combo: arm one-shot guard to suppress reopen
+                            self._prevent_reopen_once = True
+                        elif isinstance(target_combo, SearchableCombo) and target_combo.isEnabled():
+                            def _open_other():
+                                if target_combo and target_combo.isEnabled():
+                                    try:
+                                        target_combo.setFocus(Qt.MouseFocusReason)
+                                    except Exception:
+                                        pass
+                                    target_combo.showPopup()
+                            if sys.platform != "win32":
+                                QTimer.singleShot(0, _open_other)
+                            else:
+                                container = self._popup_container
+                                opened_on_destroy = False
+                                try:
+                                    if container is not None:
+                                        container.destroyed.connect(lambda *_: QTimer.singleShot(0, _open_other))
+                                        opened_on_destroy = True
+                                except Exception:
+                                    pass
+                                if not opened_on_destroy:
+                                    QTimer.singleShot(50, _open_other)
+                                try:
+                                    self.hidePopup()
+                                except Exception:
+                                    pass
+                except Exception:
+                    pass
+                return False
+
             if event.type() in (QEvent.Resize, QEvent.Show):
                 self._place_popup_header()
                 # Also ensure fitting after container geometry changes
@@ -753,6 +818,8 @@ class SearchableCombo(SeparatorComboBox):
             if event.type() == QEvent.KeyPress:
                 key = event.key()
                 if key == Qt.Key_Escape:
+                    # Explicitly close popup from header
+                    self.hidePopup()
                     return True
                 if key in (Qt.Key_Up, Qt.Key_Down, Qt.Key_PageUp, Qt.Key_PageDown, Qt.Key_Home, Qt.Key_End):
                     self._handle_navigation_key(key)
@@ -769,11 +836,24 @@ class SearchableCombo(SeparatorComboBox):
                     self._commit_view_current()
                     return True
                 if event.key() == Qt.Key_Escape:
+                    # Close from view/viewport ESC and keep control flow consistent
+                    self.hidePopup()
                     return True
             return False
 
         return super().eventFilter(obj, event)
 
+    # Helpers to walk up to owning combo under a point
+    def _ascend_to_combo(self, widget):
+        """Ascend from a widget to the nearest SearchableCombo owner if present."""
+        w = widget
+        while w is not None and not isinstance(w, SearchableCombo):
+            try:
+                w = w.parentWidget()
+            except Exception:
+                return None
+        return w
+
     # ----- Magnifier helpers -----
 
     def _ensure_magnifier_on(self, line_edit: QLineEdit | None):
@@ -938,6 +1018,44 @@ class SearchableCombo(SeparatorComboBox):
         self._popup_header.setCursorPosition(len(self._popup_header.text()))
         self._ensure_clear_button_visible(self._popup_header)
 
+    # ----- Minimal ensure after show (mainly for Windows combo-to-combo switch) -----
+
+    def _ensure_header_after_show(self):
+        """
+        Re-apply critical bits after the popup is up:
+        - header exists and is parented to the popup container,
+        - viewport top margin equals header height,
+        - header is placed and focused.
+        """
+        if not self._popup_open or not self.search:
+            return
+        view = self.view()
+        if view is None:
+            return
+        container = self._popup_container or view.window()
+        if container is None:
+            return
+
+        if self._popup_header is None:
+            self._prepare_popup_header()
+            return
+
+        try:
+            if self._popup_header.parent() is not container:
+                self._popup_header.setParent(container)
+        except Exception:
+            pass
+
+        try:
+            view.setViewportMargins(0, self._popup_header_h, 0, 0)
+        except Exception:
+            pass
+
+        self._place_popup_header()
+        self._ensure_magnifier_on(self._popup_header)
+        self._ensure_clear_button_visible(self._popup_header)
+        self._focus_header_async()
+
     # ----- Search behaviour -----
 
     def _on_search_text_changed(self, text: str):