Fix clipped combo boxes and preserve native popup layouts
This commit is contained in:
@@ -14,7 +14,7 @@ from .engine import Engine
|
||||
from .model import Catalog, Policy, WIKI, duration
|
||||
from .egg_rules_gui import EggTable
|
||||
from .management import expansion_quote, manual_monster_actions
|
||||
from .native_widgets import use_native_scrollbars
|
||||
from .native_widgets import ComboBox, use_native_scrollbars
|
||||
from .login import PasswordLogin, device_id, server_labels
|
||||
from .quests import QuestPolicy
|
||||
from .daily import DailyPolicy
|
||||
@@ -64,7 +64,7 @@ def spin(low, high, value, decimals=False):
|
||||
|
||||
|
||||
def combo(options):
|
||||
widget = W.QComboBox()
|
||||
widget = ComboBox()
|
||||
for text, data in options:
|
||||
widget.addItem(text, data)
|
||||
return widget
|
||||
@@ -84,6 +84,9 @@ def table(headers):
|
||||
|
||||
def compact_layouts(widget):
|
||||
for layout in widget.findChildren(W.QLayout):
|
||||
owner = layout.parentWidget()
|
||||
if owner is not None and owner.window().windowType() == C.Qt.WindowType.Popup:
|
||||
continue
|
||||
layout.setContentsMargins(4, 4, 4, 4)
|
||||
layout.setSpacing(4)
|
||||
if isinstance(layout, W.QFormLayout):
|
||||
@@ -337,7 +340,7 @@ class Window(ActivityPages, W.QMainWindow):
|
||||
login_options.addStretch()
|
||||
self.login_button = W.QPushButton("账号密码登录并获取区服")
|
||||
self.login_button.clicked.connect(self.password_login)
|
||||
self.server_list = W.QComboBox()
|
||||
self.server_list = ComboBox()
|
||||
self.enter_button = W.QPushButton("进入选中区服")
|
||||
self.enter_button.clicked.connect(self.enter_password_server)
|
||||
self.enter_button.setEnabled(False)
|
||||
@@ -352,7 +355,7 @@ class Window(ActivityPages, W.QMainWindow):
|
||||
self.login_status = W.QLabel("未登录:账号验证 → 获取官方区服 → 选择区服 → 进入区服 → 读取角色")
|
||||
self.login_status.setWordWrap(True)
|
||||
form.addRow(self.login_status)
|
||||
self.saved_sessions = W.QComboBox()
|
||||
self.saved_sessions = ComboBox()
|
||||
self.saved_sessions.setPlaceholderText("成功读取角色后自动保存会话")
|
||||
restore = W.QPushButton("恢复选中会话(无需重输密码)")
|
||||
restore.clicked.connect(self.resume_session)
|
||||
|
||||
Reference in New Issue
Block a user