Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prerelease bugs #2294

Merged
merged 3 commits into from
Dec 21, 2023
Merged

Prerelease bugs #2294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0208063
Remove stale usage of TOGA_ICON.
freakboy3742 Dec 21, 2023
c2974a7
Update menu construction on web.
freakboy3742 Dec 21, 2023
7a8fcea
Add changenote.
freakboy3742 Dec 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changes/2294.misc.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Some minor bugs and inconsistencies discovered during pre-release testing were corrected.
2 changes: 1 addition & 1 deletion demo/toga_demo/app.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ def startup(self):
self.action2,
"Action 2",
tooltip="Perform action 2",
icon=toga.Icon.TOGA_ICON,
icon=toga.Icon.DEFAULT_ICON,
)

self.main_window.toolbar.add(cmd1, cmd2)
Expand Down
6 changes: 2 additions & 4 deletions web/src/toga_web/app.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import toga
from toga.command import GROUP_BREAK, SECTION_BREAK
from toga.command import Separator
from toga_web.libs import create_element, js
from toga_web.window import Window

Expand Down Expand Up @@ -66,9 +66,7 @@ def create_menus(self):
submenu = None

for cmd in self.interface.commands:
if cmd == GROUP_BREAK:
submenu = None
elif cmd == SECTION_BREAK:
if isinstance(cmd, Separator):
# TODO - add a section break
pass
else:
Expand Down