xenia/fox32os
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kernel: Always show the menu bar, even if the active window has none

Browse Source
This commit is contained in:
Ry 2023-01-24 17:09:34 -08:00
parent c3b68946f5
commit 70cecc8667
2 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kernel/window/event_manager_task.asm
View File

@ -138,8 +138,6 @@ event_manager_task_mouse_event_inactive_window_was_clicked:
call window_list_offset_to_struct call window_list_offset_to_struct
call get_window_menu_bar_root_struct call get_window_menu_bar_root_struct
call enable_menu_bar call enable_menu_bar
cmp r0, 0
ifz call disable_menu_bar
call clear_menu_bar call clear_menu_bar
mov r1, 0xFFFFFFFF mov r1, 0xFFFFFFFF
cmp r0, 0 cmp r0, 0

10
kernel/window/window.asm
View File

@ -136,8 +136,6 @@ new_window:
push r0 push r0
call enable_menu_bar call enable_menu_bar
mov r0, r6 mov r0, r6
cmp r0, 0
ifz call disable_menu_bar
call clear_menu_bar call clear_menu_bar
mov r1, 0xFFFFFFFF mov r1, 0xFFFFFFFF
cmp r0, 0 cmp r0, 0
@ -209,19 +207,11 @@ destroy_window:
call window_list_offset_to_struct call window_list_offset_to_struct
call get_window_menu_bar_root_struct call get_window_menu_bar_root_struct
call enable_menu_bar call enable_menu_bar
cmp r0, 0
ifz call disable_menu_bar
call clear_menu_bar call clear_menu_bar
mov r1, 0xFFFFFFFF mov r1, 0xFFFFFFFF
cmp r0, 0 cmp r0, 0
ifnz call draw_menu_bar_root_items ifnz call draw_menu_bar_root_items
pop r1
pop r0
ret
destroy_window_no_more_windows: destroy_window_no_more_windows:
call disable_menu_bar
pop r1 pop r1
pop r0 pop r0
ret ret