monorail
/
Archipelago
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[kivy] change the sizing for macOS (#1732)

This commit is contained in:
kindasneaki 2023-04-19 15:16:13 -06:00 committed by GitHub
parent 664bbd86bb
commit 0ca3c5e6a2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
kvui.py
View File

@ -25,6 +25,7 @@ from kivy.base import ExceptionHandler, ExceptionManager
from kivy.clock import Clock from kivy.clock import Clock
from kivy.factory import Factory from kivy.factory import Factory
from kivy.properties import BooleanProperty, ObjectProperty from kivy.properties import BooleanProperty, ObjectProperty
from kivy.metrics import dp
from kivy.uix.widget import Widget from kivy.uix.widget import Widget
from kivy.uix.button import Button from kivy.uix.button import Button
from kivy.uix.gridlayout import GridLayout from kivy.uix.gridlayout import GridLayout
@ -343,18 +344,18 @@ class GameManager(App):
self.grid = MainLayout() self.grid = MainLayout()
self.grid.cols = 1 self.grid.cols = 1
self.connect_layout = BoxLayout(orientation="horizontal", size_hint_y=None, height=30) self.connect_layout = BoxLayout(orientation="horizontal", size_hint_y=None, height=dp(30))
# top part # top part
server_label = ServerLabel() server_label = ServerLabel()
self.connect_layout.add_widget(server_label) self.connect_layout.add_widget(server_label)
self.server_connect_bar = ConnectBarTextInput(text=self.ctx.suggested_address or "archipelago.gg:", size_hint_y=None, self.server_connect_bar = ConnectBarTextInput(text=self.ctx.suggested_address or "archipelago.gg:", size_hint_y=None,
height=30, multiline=False, write_tab=False) height=dp(30), multiline=False, write_tab=False)
def connect_bar_validate(sender): def connect_bar_validate(sender):
if not self.ctx.server: if not self.ctx.server:
self.connect_button_action(sender) self.connect_button_action(sender)
self.server_connect_bar.bind(on_text_validate=connect_bar_validate) self.server_connect_bar.bind(on_text_validate=connect_bar_validate)
self.connect_layout.add_widget(self.server_connect_bar) self.connect_layout.add_widget(self.server_connect_bar)
self.server_connect_button = Button(text="Connect", size=(100, 30), size_hint_y=None, size_hint_x=None) self.server_connect_button = Button(text="Connect", size=(dp(100), dp(30)), size_hint_y=None, size_hint_x=None)
self.server_connect_button.bind(on_press=self.connect_button_action) self.server_connect_button.bind(on_press=self.connect_button_action)
self.connect_layout.add_widget(self.server_connect_button) self.connect_layout.add_widget(self.server_connect_button)
self.grid.add_widget(self.connect_layout) self.grid.add_widget(self.connect_layout)
@ -387,11 +388,11 @@ class GameManager(App):
self.tabs.tab_height = 0 self.tabs.tab_height = 0
# bottom part # bottom part
bottom_layout = BoxLayout(orientation="horizontal", size_hint_y=None, height=30) bottom_layout = BoxLayout(orientation="horizontal", size_hint_y=None, height=dp(30))
info_button = Button(height=30, text="Command:", size_hint_x=None) info_button = Button(size=(dp(100), dp(30)), text="Command:", size_hint_x=None)
info_button.bind(on_release=self.command_button_action) info_button.bind(on_release=self.command_button_action)
bottom_layout.add_widget(info_button) bottom_layout.add_widget(info_button)
self.textinput = TextInput(size_hint_y=None, height=30, multiline=False, write_tab=False) self.textinput = TextInput(size_hint_y=None, height=dp(30), multiline=False, write_tab=False)
self.textinput.bind(on_text_validate=self.on_message) self.textinput.bind(on_text_validate=self.on_message)
self.textinput.text_validate_unfocus = False self.textinput.text_validate_unfocus = False
bottom_layout.add_widget(self.textinput) bottom_layout.add_widget(self.textinput)