Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-07 02:41:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

[USETUP]

Browse source 
Usetup does not properly return from quit+cancel. Patch by Ștefan Fulea.
CORE-7783 #resolve #comment Thanks a lot!

svn path=/trunk/; revision=61687
This commit is contained in:
Eric Kohl 2014-01-19 09:47:27 +00:00
parent 32a9726da2
commit 04487e7a90
3 changed files with 21 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
reactos/base/setup/usetup/genlist.c
View file

@ -482,6 +482,20 @@ ScrollUpGenericList (PGENERIC_LIST List)
} }
VOID
RedrawGenericList(PGENERIC_LIST List)
{
if (List->CurrentEntry == NULL)
return;
if (List->Redraw)
{
DrawListEntries(List);
DrawScrollBarGenericList(List);
}
}
VOID VOID
SetCurrentListEntry(PGENERIC_LIST List, PGENERIC_LIST_ENTRY Entry) SetCurrentListEntry(PGENERIC_LIST List, PGENERIC_LIST_ENTRY Entry)
{ {

3
reactos/base/setup/usetup/genlist.h
View file

@ -69,6 +69,9 @@ ScrollPageUpGenericList(PGENERIC_LIST List);
VOID VOID
ScrollToPositionGenericList (PGENERIC_LIST List, ULONG uIndex); ScrollToPositionGenericList (PGENERIC_LIST List, ULONG uIndex);
VOID
RedrawGenericList(PGENERIC_LIST List);
VOID VOID
SetCurrentListEntry(PGENERIC_LIST List, PGENERIC_LIST_ENTRY Entry); SetCurrentListEntry(PGENERIC_LIST List, PGENERIC_LIST_ENTRY Entry);

6
reactos/base/setup/usetup/interface/usetup.c
View file

@ -676,6 +676,8 @@ LanguagePage(PINPUT_RECORD Ir)
{ {
if (ConfirmQuit(Ir) == TRUE) if (ConfirmQuit(Ir) == TRUE)
return QUIT_PAGE; return QUIT_PAGE;
else
RedrawGenericList(LanguageList);
} }
else if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */ else if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */
{ {
@ -1354,7 +1356,7 @@ KeyboardSettingsPage(PINPUT_RECORD Ir)
} }
} }
return DISPLAY_SETTINGS_PAGE; return KEYBOARD_SETTINGS_PAGE;
} }
@ -1420,7 +1422,7 @@ LayoutSettingsPage(PINPUT_RECORD Ir)
} }
} }
return DISPLAY_SETTINGS_PAGE; return LAYOUT_SETTINGS_PAGE;
} }