adam/cobm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Main menu no longer resets when quitting from submenu in Setup

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2127 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
mcmartin
2005-12-27 05:19:32 +00:00
parent a54298c7b9
commit c327367182
3 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/ChangeLog
+1
View File
@@ -1,4 +1,5 @@
Changes towards version 0.5: Changes towards version 0.5:
- Setup menu selection doesn't reset when you quit a submenu now - Michael
- Split config.alwaysgl and config.usegl so that "Use Pure Mode If Possible" - Split config.alwaysgl and config.usegl so that "Use Pure Mode If Possible"
persists across runs even when using a GL mode - Michael persists across runs even when using a GL mode - Michael
- Fixed Yehat Rebel left hand doubling up problem (bug #807) - Alex - Fixed Yehat Rebel left hand doubling up problem (bug #807) - Alex
sc2/src/sc2code/libs/graphics/widgets.c
+8 -1
View File
@@ -402,12 +402,19 @@ Widget_ReceiveFocusMenuScreen (WIDGET *_self, int event)
dx = -1; dx = -1;
last_x = -1; last_x = -1;
} }
else else if (event == WIDGET_EVENT_DOWN)
{ {
x = 0; x = 0;
dx = 1; dx = 1;
last_x = self->num_children; last_x = self->num_children;
} }
else
{
/* Leave highlighted value the same */
WIDGET *child = self->child[self->highlighted];
child->receiveFocus (child, event);
return TRUE;
}
for ( ; x != last_x; x += dx) for ( ; x != last_x; x += dx)
{ {
WIDGET *child = self->child[x]; WIDGET *child = self->child[x];
sc2/src/sc2code/setupmenu.c
+8 -1
View File
@@ -503,6 +503,7 @@ quit_sub_menu (WIDGET *self, int event)
if (event == WIDGET_EVENT_SELECT) if (event == WIDGET_EVENT_SELECT)
{ {
next = (WIDGET *)(&menu); next = (WIDGET *)(&menu);
(*next->receiveFocus) (next, WIDGET_EVENT_SELECT);
return TRUE; return TRUE;
} }
(void)self; (void)self;
@@ -515,6 +516,7 @@ do_graphics (WIDGET *self, int event)
if (event == WIDGET_EVENT_SELECT) if (event == WIDGET_EVENT_SELECT)
{ {
next = (WIDGET *)(&graphics_menu); next = (WIDGET *)(&graphics_menu);
(*next->receiveFocus) (next, WIDGET_EVENT_DOWN);
return TRUE; return TRUE;
} }
(void)self; (void)self;
@@ -527,6 +529,7 @@ do_audio (WIDGET *self, int event)
if (event == WIDGET_EVENT_SELECT) if (event == WIDGET_EVENT_SELECT)
{ {
next = (WIDGET *)(&audio_menu); next = (WIDGET *)(&audio_menu);
(*next->receiveFocus) (next, WIDGET_EVENT_DOWN);
return TRUE; return TRUE;
} }
(void)self; (void)self;
@@ -539,6 +542,7 @@ do_engine (WIDGET *self, int event)
if (event == WIDGET_EVENT_SELECT) if (event == WIDGET_EVENT_SELECT)
{ {
next = (WIDGET *)(&engine_menu); next = (WIDGET *)(&engine_menu);
(*next->receiveFocus) (next, WIDGET_EVENT_DOWN);
return TRUE; return TRUE;
} }
(void)self; (void)self;
@@ -551,6 +555,7 @@ do_resources (WIDGET *self, int event)
if (event == WIDGET_EVENT_SELECT) if (event == WIDGET_EVENT_SELECT)
{ {
next = (WIDGET *)(&resources_menu); next = (WIDGET *)(&resources_menu);
(*next->receiveFocus) (next, WIDGET_EVENT_DOWN);
return TRUE; return TRUE;
} }
(void)self; (void)self;
@@ -563,6 +568,7 @@ do_keyconfig (WIDGET *self, int event)
if (event == WIDGET_EVENT_SELECT) if (event == WIDGET_EVENT_SELECT)
{ {
next = (WIDGET *)(&keyconfig_menu); next = (WIDGET *)(&keyconfig_menu);
(*next->receiveFocus) (next, WIDGET_EVENT_DOWN);
return TRUE; return TRUE;
} }
(void)self; (void)self;
@@ -575,6 +581,7 @@ do_advanced (WIDGET *self, int event)
if (event == WIDGET_EVENT_SELECT) if (event == WIDGET_EVENT_SELECT)
{ {
next = (WIDGET *)(&advanced_menu); next = (WIDGET *)(&advanced_menu);
(*next->receiveFocus) (next, WIDGET_EVENT_DOWN);
return TRUE; return TRUE;
} }
(void)self; (void)self;
@@ -666,6 +673,7 @@ DoSetupMenu (PSETUP_MENU_STATE pInputState)
current = NULL; current = NULL;
next = (WIDGET *)(&menu); next = (WIDGET *)(&menu);
(*next->receiveFocus) (next, WIDGET_EVENT_DOWN);
pInputState->initialized = TRUE; pInputState->initialized = TRUE;
} }
@@ -697,7 +705,6 @@ DoSetupMenu (PSETUP_MENU_STATE pInputState)
if (current != next) if (current != next)
{ {
SetTransitionSource (NULL); SetTransitionSource (NULL);
(*next->receiveFocus) (next, WIDGET_EVENT_DOWN);
} }
BatchGraphics (); BatchGraphics ();