From 06c60d4a34696f2839be3cd166916179877acc41 Mon Sep 17 00:00:00 2001 From: Auric Vente Date: Fri, 19 Jul 2024 01:31:19 -0600 Subject: [PATCH] Mods --- cromulant/config.py | 1 - cromulant/window.py | 39 +++++++++++++++++++++++---------------- 2 files changed, 23 insertions(+), 17 deletions(-) diff --git a/cromulant/config.py b/cromulant/config.py index cac9bfd..09e3b75 100644 --- a/cromulant/config.py +++ b/cromulant/config.py @@ -28,7 +28,6 @@ class Config: hatch_burst: int = 3 font_size: int = 20 footer_font_size: int = 18 - footer_background_color: str = "#424242" @staticmethod def prepare() -> None: diff --git a/cromulant/window.py b/cromulant/window.py index 66ddd6d..d228bec 100644 --- a/cromulant/window.py +++ b/cromulant/window.py @@ -15,7 +15,6 @@ from PySide6.QtWidgets import QComboBox from PySide6.QtWidgets import QLayout from PySide6.QtWidgets import QSizePolicy from PySide6.QtWidgets import QMessageBox -from PySide6.QtWidgets import QLabel from PySide6.QtGui import QMouseEvent # type: ignore from PySide6.QtGui import QIcon from PySide6.QtCore import Qt # type: ignore @@ -42,7 +41,7 @@ class Window: view_scene: QGraphicsScene speed: QComboBox scroll_area: QScrollArea - info: QLabel + info: SpecialButton @staticmethod def prepare() -> None: @@ -75,6 +74,9 @@ class Window: from .ants import Ants from .game import Game + root = QWidget() + container = QHBoxLayout() + btn_hatch = SpecialButton("Hatch") btn_hatch.clicked.connect(lambda e: Ants.hatch()) btn_hatch.middleClicked.connect(lambda: Ants.hatch_burst()) @@ -88,16 +90,16 @@ class Window: Window.speed.setCurrentIndex(1) Window.speed.currentIndexChanged.connect(Game.update_speed) - btn_top = QPushButton("Top") + btn_top = SpecialButton("Top") btn_top.clicked.connect(Window.to_top) - layout = QHBoxLayout() - layout.addWidget(btn_hatch) - layout.addWidget(btn_terminate) - layout.addWidget(Window.speed) - layout.addWidget(btn_top) + container.addWidget(btn_hatch) + container.addWidget(btn_terminate) + container.addWidget(Window.speed) + container.addWidget(btn_top) - Window.root.addLayout(layout) + root.setLayout(container) + Window.root.addWidget(root) @staticmethod def add_view() -> None: @@ -165,15 +167,20 @@ class Window: def to_top() -> None: Window.scroll_area.verticalScrollBar().setValue(0) + @staticmethod + def to_bottom() -> None: + Window.scroll_area.verticalScrollBar().setValue( + Window.scroll_area.verticalScrollBar().maximum() + ) + @staticmethod def add_footer() -> None: root = QWidget() - root.setStyleSheet(f"background-color: {Config.footer_background_color};") - layout = QHBoxLayout() - Window.info = QLabel("---") - Window.info.setWordWrap(True) - Window.info.setStyleSheet(f"font-size: {Config.footer_font_size}px;") + root.setContentsMargins(0, 0, 0, 0) + container = QHBoxLayout() + Window.info = SpecialButton("---") + Window.info.clicked.connect(Window.to_bottom) Window.expand(Window.info) - layout.addWidget(Window.info) - root.setLayout(layout) + container.addWidget(Window.info) + root.setLayout(container) Window.root.addWidget(root)