lm
/
ICRA
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Resolve merge conflict for toolbar label spacing

This commit is contained in:
lm 2025-10-17 15:31:31 +02:00
parent 657092be96 1666cb9aa5
commit 9237e3acd5
1 changed files with 521 additions and 521 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/gui/ui.py
View File

@ -16,15 +16,15 @@ class UIBuilderMixin:
toolbar = ttk.Frame(self.root) toolbar = ttk.Frame(self.root)
toolbar.pack(fill=tk.X, padx=12, pady=(4, 2)) toolbar.pack(fill=tk.X, padx=12, pady=(4, 2))
buttons = [ buttons = [
("📂 Bild laden", self.load_image), ("📂 Bild laden", self.load_image),
("📁 Ordner laden", self.load_folder), ("📁 Ordner laden", self.load_folder),
("🎨 Farbe wählen", self.choose_color), ("🎨 Farbe wählen", self.choose_color),
("🖱 Farbe aus Bild klicken", self.enable_pick_mode), ("🖱 Farbe aus Bild klicken", self.enable_pick_mode),
("💾 Overlay speichern", self.save_overlay), ("💾 Overlay speichern", self.save_overlay),
("🧹 Excludes löschen", self.clear_excludes), ("🧹 Excludes löschen", self.clear_excludes),
("↩ Letztes Exclude entfernen", self.undo_exclude), ("↩ Letztes Exclude entfernen", self.undo_exclude),
("🔄 Slider zurücksetzen", self.reset_sliders), ("🔄 Slider zurücksetzen", self.reset_sliders),
("🌓 Theme umschalten", self.toggle_theme), ("🌓 Theme umschalten", self.toggle_theme),
] ]
self._toolbar_buttons: list[dict[str, object]] = [] self._toolbar_buttons: list[dict[str, object]] = []
self._nav_buttons: list[tk.Button] = [] self._nav_buttons: list[tk.Button] = []
@ -201,7 +201,7 @@ class UIBuilderMixin:
def _add_toolbar_button(self, parent, text: str, command) -> None: def _add_toolbar_button(self, parent, text: str, command) -> None:
font = tkfont.Font(root=self.root, family="Segoe UI", size=9) font = tkfont.Font(root=self.root, family="Segoe UI", size=9)
padding_x = 12 padding_x = 18
width = font.measure(text) + padding_x * 2 width = font.measure(text) + padding_x * 2
height = 28 height = 28
radius = 9 radius = 9