diff options
| author | Richard Wilson <rjw@netsurf-browser.org> | 2004-06-28 19:35:04 +0000 |
|---|---|---|
| committer | Richard Wilson <rjw@netsurf-browser.org> | 2004-06-28 19:35:04 +0000 |
| commit | 4479072d167d364f69e8963a5a2034761d6a8efc (patch) | |
| tree | 2be7b0579319168cbb079922c310160d3777eba5 /riscos/menus.c | |
| parent | c6dd3cb9abe3a11f764f9f23b3102f31bd7b2052 (diff) | |
| download | netsurf-4479072d167d364f69e8963a5a2034761d6a8efc.tar.gz netsurf-4479072d167d364f69e8963a5a2034761d6a8efc.tar.bz2 | |
[project @ 2004-06-28 19:35:04 by rjw]
Optional window size inheritance to appease tlsa. Updates to code comments. Ctrl-N shortcut to open a new window.
svn path=/import/netsurf/; revision=1023
Diffstat (limited to 'riscos/menus.c')
| -rw-r--r-- | riscos/menus.c | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/riscos/menus.c b/riscos/menus.c index de69f4211..295d03d4c 100644 --- a/riscos/menus.c +++ b/riscos/menus.c @@ -190,11 +190,12 @@ static wimp_MENU(4) toolbar_menu = { /* Window submenu */ -static wimp_MENU(3) window_menu = { +static wimp_MENU(4) window_menu = { { "Window" }, 7,2,7,0, 300, 44, 0, { { 0, wimp_NO_SUB_MENU, DEFAULT_FLAGS, { "WindowSave" } }, - { wimp_MENU_SEPARATE, wimp_NO_SUB_MENU, DEFAULT_FLAGS, { "WindowStagr" } }, + { 0, wimp_NO_SUB_MENU, DEFAULT_FLAGS, { "WindowStagr" } }, + { wimp_MENU_SEPARATE, wimp_NO_SUB_MENU, DEFAULT_FLAGS, { "WindowSize" } }, { wimp_MENU_LAST, wimp_NO_SUB_MENU, DEFAULT_FLAGS, { "WindowReset" } } } }; @@ -454,7 +455,7 @@ void ro_gui_menu_selection(wimp_selection *selection) case 5: /* Print */ break; case 6: /* New window */ - browser_window_create(current_gui->url ,current_gui->data.browser.bw); + browser_window_create(current_gui->url, current_gui->data.browser.bw); break; case 7: /* Page source */ ro_gui_view_source(c); @@ -582,6 +583,9 @@ void ro_gui_menu_selection(wimp_selection *selection) option_window_stagger = !option_window_stagger; break; case 2: + option_window_size_clone = !option_window_size_clone; + break; + case 3: option_window_screen_width = 0; option_window_screen_height = 0; break; @@ -977,7 +981,7 @@ static void ro_gui_menu_prepare_window(void) { */ if ((option_window_screen_width != 0) && (option_window_screen_height != 0)) { browser_window_menu->entries[1].icon_flags &= ~wimp_ICON_SHADED; - browser_window_menu->entries[2].icon_flags &= ~wimp_ICON_SHADED; + browser_window_menu->entries[3].icon_flags &= ~wimp_ICON_SHADED; /* Check if we are staggered */ @@ -989,7 +993,15 @@ static void ro_gui_menu_prepare_window(void) { } else { browser_window_menu->entries[1].menu_flags |= wimp_MENU_TICKED; browser_window_menu->entries[1].icon_flags |= wimp_ICON_SHADED; - browser_window_menu->entries[2].icon_flags |= wimp_ICON_SHADED; + browser_window_menu->entries[3].icon_flags |= wimp_ICON_SHADED; + } + + /* Set if we are cloing the window size + */ + if (option_window_size_clone) { + browser_window_menu->entries[2].menu_flags |= wimp_MENU_TICKED; + } else { + browser_window_menu->entries[2].menu_flags &= ~wimp_MENU_TICKED; } } |