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