Skip to content

Commit e3de00f

Browse files
committed
add: 変更できてなかった?
1 parent 57ae680 commit e3de00f

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

main.py

+7-5
Original file line numberDiff line numberDiff line change
@@ -239,22 +239,24 @@ def create_display_window(self):
239239
# F11キーでバー表示モードを切り替える
240240
self.display_window.bind("<F11>", self.toggle_hide_bar)
241241

242+
display_width = self.display_window.winfo_screenwidth()
242243
self.display_window.grid_rowconfigure(0, weight=1)
243244
self.display_window.grid_rowconfigure(1, weight=10)
244-
self.display_window.grid_columnconfigure((0, 1, 2), weight=1)
245+
self.display_window.grid_columnconfigure(1, weight=1)
246+
self.display_window.grid_columnconfigure((0, 2), weight=10, minsize=(display_width)//2)
245247

246248
cooking_text_label = ctk.CTkLabel(self.display_window, text="-調理中-", font=("Arial", 24, "bold"))
247-
cooking_text_label.grid(row=0, column=0, padx=(20, 20), pady=(0, 20))
249+
cooking_text_label.grid(row=0, column=0, pady=(0, 20))
248250

249251
provide_text_label = ctk.CTkLabel(self.display_window, text_color="darkgreen", text="-できあがり-", font=("Arial", 24, "bold"))
250-
provide_text_label.grid(row=0, column=2, padx=(20, 20), pady=(0, 20))
252+
provide_text_label.grid(row=0, column=2, pady=(0, 20))
251253

252254
# 調理中の番号表示
253-
self.cooking_label = ctk.CTkLabel(self.display_window, text="", font=("Arial", 60, "bold"))
255+
self.cooking_label = ctk.CTkLabel(self.display_window, text="", font=("Arial", 54, "bold"))
254256
self.cooking_label.grid(row=1, column=0, padx=(0, 0), sticky="n")
255257

256258
# 提供中の番号表示
257-
self.provide_label = ctk.CTkLabel(self.display_window, text_color="darkgreen", text="", font=("Arial", 60, "bold"))
259+
self.provide_label = ctk.CTkLabel(self.display_window, text_color="darkgreen", text="", font=("Arial", 54, "bold"))
258260
self.provide_label.grid(row=1, column=2, padx=(0, 0), sticky="n")
259261

260262
# 調理中ラベルと提供中ラベルの間に縦線を追加

menu_dialogue.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ def close_dialog(self):
8181

8282
def open_dialog(root):
8383
"""ダイアログを開く処理"""
84-
options = ["はちみつ", "チョコソース", "ケチャップ&マスタード", "ケチャップのみ", "マスタードのみ", "プレーン"]
84+
options = ["はちみつ", "チョコソース", "ケチャップ&マスタード", "ケチャップのみ", "マスタードのみ", "プレーン", "後でトッピング"]
8585

8686
dialog = ThreeOptionDialog(root, message="どのソースを選びますか?", options=options)
8787
root.wait_window(dialog) # ダイアログが閉じるまで待機

0 commit comments

Comments
 (0)