Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
TomSchimansky committed Oct 7, 2022
2 parents 6319594 + db58423 commit 1696016
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
4 changes: 4 additions & 0 deletions customtkinter/widgets/dropdown_menu.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ def _configure_menu_for_platforms(self):
font=self._apply_font_scaling(self._font))

elif sys.platform.startswith("win"):
print("dropdon win")
self.configure(tearoff=False,
relief="flat",
activebackground=ThemeManager.single_color(self._hover_color, self._appearance_mode),
Expand Down Expand Up @@ -95,6 +96,7 @@ def _button_callback(self, value):
self._command(value)

def open(self, x: Union[int, float], y: Union[int, float]):

if sys.platform == "darwin":
y += self._apply_widget_scaling(8)
else:
Expand Down Expand Up @@ -129,6 +131,8 @@ def configure(self, **kwargs):
self._values = kwargs.pop("values")
self._add_menu_commands()

super().configure(**kwargs)

def cget(self, attribute_name: str) -> any:
if attribute_name == "min_character_width":
return self._min_character_width
Expand Down
2 changes: 1 addition & 1 deletion test/manual_integration_tests/test_textbox.py
Original file line number Diff line number Diff line change
Expand Up @@ -99,5 +99,5 @@
scrollbar4.grid(row=0, column=5, sticky="nsew")
textbox_4.configure(yscrollcommand=scrollbar4.set)

app.after(3000, lambda: customtkinter.set_appearance_mode("light"))
# app.after(3000, lambda: customtkinter.set_appearance_mode("light"))
app.mainloop()

0 comments on commit 1696016

Please sign in to comment.