From 918dc6ab7d0712888d4cbb59a74cfc1aab487699 Mon Sep 17 00:00:00 2001 From: Christoph von Wittich Date: Thu, 31 Jan 2008 07:33:02 +0000 Subject: [PATCH] don't draw the standard UI background in minimal mode some code reduction svn path=/trunk/; revision=32061 --- reactos/boot/freeldr/freeldr/ui/minitui.c | 2 +- reactos/boot/freeldr/freeldr/ui/ui.c | 46 +++-------------------- 2 files changed, 6 insertions(+), 42 deletions(-) diff --git a/reactos/boot/freeldr/freeldr/ui/minitui.c b/reactos/boot/freeldr/freeldr/ui/minitui.c index c3f46ea21a1..47bd56f135d 100644 --- a/reactos/boot/freeldr/freeldr/ui/minitui.c +++ b/reactos/boot/freeldr/freeldr/ui/minitui.c @@ -149,7 +149,7 @@ const UIVTBL MiniTuiVtbl = TuiEditBox, TuiTextToColor, TuiTextToFillStyle, - TuiFadeInBackdrop, + MiniTuiDrawBackdrop, /* no FadeIn */ TuiFadeOut, TuiDisplayMenu, MiniTuiDrawMenu, diff --git a/reactos/boot/freeldr/freeldr/ui/ui.c b/reactos/boot/freeldr/freeldr/ui/ui.c index 5867e568475..19d4c010ef5 100644 --- a/reactos/boot/freeldr/freeldr/ui/ui.c +++ b/reactos/boot/freeldr/freeldr/ui/ui.c @@ -95,7 +95,6 @@ BOOLEAN UiInitialize(BOOLEAN ShowGui) } DbgPrint((DPRINT_UI, "Initializing User Interface.\n")); - DbgPrint((DPRINT_UI, "Reading in UI settings from [Display] section.\n")); DisplayModeText[0] = '\0'; @@ -107,14 +106,7 @@ BOOLEAN UiInitialize(BOOLEAN ShowGui) } if (IniReadSettingByName(SectionId, "MinimalUI", SettingText, sizeof(SettingText))) { - if (_stricmp(SettingText, "Yes") == 0 && strlen(SettingText) == 3) - { - UiMinimal = TRUE; - } - else - { - UiMinimal = FALSE; - } + UiMinimal = (_stricmp(SettingText, "Yes") == 0 && strlen(SettingText) == 3); } } @@ -208,47 +200,19 @@ BOOLEAN UiInitialize(BOOLEAN ShowGui) } if (IniReadSettingByName(SectionId, "SpecialEffects", SettingText, sizeof(SettingText))) { - if (_stricmp(SettingText, "Yes") == 0 && strlen(SettingText) == 3) - { - UiUseSpecialEffects = TRUE; - } - else - { - UiUseSpecialEffects = FALSE; - } + UiUseSpecialEffects = (_stricmp(SettingText, "Yes") == 0 && strlen(SettingText) == 3); } if (IniReadSettingByName(SectionId, "ShowTime", SettingText, sizeof(SettingText))) { - if (_stricmp(SettingText, "Yes") == 0 && strlen(SettingText) == 3) - { - UiDrawTime = TRUE; - } - else - { - UiDrawTime = FALSE; - } + UiDrawTime = (_stricmp(SettingText, "Yes") == 0 && strlen(SettingText) == 3); } if (IniReadSettingByName(SectionId, "MenuBox", SettingText, sizeof(SettingText))) { - if (_stricmp(SettingText, "Yes") == 0 && strlen(SettingText) == 3) - { - UiMenuBox = TRUE; - } - else - { - UiMenuBox = FALSE; - } + UiMenuBox = (_stricmp(SettingText, "Yes") == 0 && strlen(SettingText) == 3); } if (IniReadSettingByName(SectionId, "CenterMenu", SettingText, sizeof(SettingText))) { - if (_stricmp(SettingText, "Yes") == 0 && strlen(SettingText) == 3) - { - UiCenterMenu = TRUE; - } - else - { - UiCenterMenu = FALSE; - } + UiCenterMenu = (_stricmp(SettingText, "Yes") == 0 && strlen(SettingText) == 3); } }