From bbeb80fc482eafd133f91762aaa0856b9ac2a6f5 Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Sun, 17 Oct 2021 13:22:36 -0700 Subject: [PATCH] Give aircraft purchase the majority of the window. This makes long squadron names more likely to fit. I also added a horizontal scroll bar for the cases when this still isn't enough space and made the vertical scroll bar only appear when necessary. Typically aircraft purchase menus are neither wide enough for long enough to need either scroll bar. Fixes https://github.com/dcs-liberation/dcs_liberation/issues/1592 --- .../basemenu/airfield/QAircraftRecruitmentMenu.py | 2 -- qt_ui/windows/basemenu/airfield/QAirfieldCommand.py | 9 ++++----- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/qt_ui/windows/basemenu/airfield/QAircraftRecruitmentMenu.py b/qt_ui/windows/basemenu/airfield/QAircraftRecruitmentMenu.py index dc668d28..c82605b8 100644 --- a/qt_ui/windows/basemenu/airfield/QAircraftRecruitmentMenu.py +++ b/qt_ui/windows/basemenu/airfield/QAircraftRecruitmentMenu.py @@ -54,8 +54,6 @@ class QAircraftRecruitmentMenu(UnitTransactionFrame[Squadron]): scroll_content.setLayout(task_box_layout) scroll = QScrollArea() - scroll.setHorizontalScrollBarPolicy(Qt.ScrollBarAlwaysOff) - scroll.setVerticalScrollBarPolicy(Qt.ScrollBarAlwaysOn) scroll.setWidgetResizable(True) scroll.setWidget(scroll_content) main_layout.addLayout(self.hangar_status) diff --git a/qt_ui/windows/basemenu/airfield/QAirfieldCommand.py b/qt_ui/windows/basemenu/airfield/QAirfieldCommand.py index 289fd8f8..ad0afc66 100644 --- a/qt_ui/windows/basemenu/airfield/QAirfieldCommand.py +++ b/qt_ui/windows/basemenu/airfield/QAirfieldCommand.py @@ -1,4 +1,4 @@ -from PySide2.QtWidgets import QFrame, QGridLayout, QGroupBox, QVBoxLayout +from PySide2.QtWidgets import QFrame, QGroupBox, QHBoxLayout, QVBoxLayout from game.theater import ControlPoint from qt_ui.models import GameModel @@ -16,14 +16,13 @@ class QAirfieldCommand(QFrame): self.init_ui() def init_ui(self): - layout = QGridLayout() - layout.setHorizontalSpacing(1) - layout.addWidget(QAircraftRecruitmentMenu(self.cp, self.game_model), 0, 0) + layout = QHBoxLayout() + layout.addWidget(QAircraftRecruitmentMenu(self.cp, self.game_model), stretch=5) planned = QGroupBox("Planned Flights") planned_layout = QVBoxLayout() planned_layout.addWidget(QPlannedFlightsView(self.game_model, self.cp)) planned.setLayout(planned_layout) - layout.addWidget(planned, 0, 1) + layout.addWidget(planned, stretch=3) self.setLayout(layout)