Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 10:04:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

[FREELDR:UI] Improve how menu line separators are drawn.

Browse source 
When the menu is not boxed, do not draw the specific "T"-shaped box
corners for the separators.
This commit is contained in:
Hermès Bélusca-Maïto 2022-02-14 16:58:06 +01:00
parent c322610f6e
commit 5239a0ca4d
No known key found for this signature in database
GPG key ID: 3B2539C65E7B93D0
1 changed files with 64 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

120
boot/freeldr/freeldr/ui/tuimenu.c
View file

@ -349,24 +349,6 @@ TuiDrawMenuBox(
ATTR(UiMenuFgColor, UiMenuBgColor));
}
}
/* Loop each item */
for (i = 0; i < MenuInfo->MenuItemCount; i++)
{
/* Check if it's a separator */
if (MenuInfo->MenuItemList[i] == NULL)
{
/* Draw the separator line */
UiDrawText(MenuInfo->Left,
MenuInfo->Top + i + 1,
"\xC7",
ATTR(UiMenuFgColor, UiMenuBgColor));
UiDrawText(MenuInfo->Right,
MenuInfo->Top + i + 1,
"\xB6",
ATTR(UiMenuFgColor, UiMenuBgColor));
}
}
}
VOID
@ -374,15 +356,55 @@ TuiDrawMenuItem(
_In_ PUI_MENU_INFO MenuInfo,
_In_ ULONG MenuItemNumber)
{
#ifndef _M_ARM
ULONG i;
ULONG SpaceTotal;
ULONG SpaceLeft;
ULONG SpaceRight = 0;
#endif
UCHAR Attribute = ATTR(UiTextColor, UiMenuBgColor);
ULONG SpaceRight;
UCHAR Attribute;
CHAR MenuLineText[80];
/* If this is a separator */
if (MenuInfo->MenuItemList[MenuItemNumber] == NULL)
{
#ifndef _M_ARM // FIXME: Theme-specific
/* Draw its left box corner */
if (UiMenuBox)
{
UiDrawText(MenuInfo->Left,
MenuInfo->Top + 1 + MenuItemNumber,
"\xC7",
ATTR(UiMenuFgColor, UiMenuBgColor));
}
#endif
/* Make it a separator line and use menu colors */
RtlZeroMemory(MenuLineText, sizeof(MenuLineText));
RtlFillMemory(MenuLineText,
min(sizeof(MenuLineText), (MenuInfo->Right - MenuInfo->Left - 1)),
0xC4);
/* Draw the item */
UiDrawText(MenuInfo->Left + 1,
MenuInfo->Top + 1 + MenuItemNumber,
MenuLineText,
ATTR(UiMenuFgColor, UiMenuBgColor));
#ifndef _M_ARM // FIXME: Theme-specific
/* Draw its right box corner */
if (UiMenuBox)
{
UiDrawText(MenuInfo->Right,
MenuInfo->Top + 1 + MenuItemNumber,
"\xB6",
ATTR(UiMenuFgColor, UiMenuBgColor));
}
#endif
/* We are done */
return;
}
/* This is not a separator */
ASSERT(MenuInfo->MenuItemList[MenuItemNumber]);
#ifndef _M_ARM
/* Check if using centered menu */
if (UiCenterMenu)
@ -391,51 +413,37 @@ TuiDrawMenuItem(
* We will want the string centered so calculate
* how many spaces will be to the left and right.
*/
SpaceTotal = (MenuInfo->Right - MenuInfo->Left - 2) -
(ULONG)(MenuInfo->MenuItemList[MenuItemNumber] ?
strlen(MenuInfo->MenuItemList[MenuItemNumber]) : 0);
SpaceLeft = (SpaceTotal / 2) + 1;
ULONG SpaceTotal =
(MenuInfo->Right - MenuInfo->Left - 2) -
(ULONG)strlen(MenuInfo->MenuItemList[MenuItemNumber]);
SpaceLeft = (SpaceTotal / 2) + 1;
SpaceRight = (SpaceTotal - SpaceLeft) + 1;
/* Insert the spaces on the left */
for (i = 0; i < SpaceLeft; i++)
MenuLineText[i] = ' ';
MenuLineText[i] = '\0';
}
else
#endif
{
/* Simply left-align it */
MenuLineText[0] = '\0';
strcat(MenuLineText, " ");
SpaceLeft = 4;
SpaceRight = 0;
}
/* Now append the text string */
if (MenuInfo->MenuItemList[MenuItemNumber])
strcat(MenuLineText, MenuInfo->MenuItemList[MenuItemNumber]);
/* Format the item text string */
RtlStringCbPrintfA(MenuLineText, sizeof(MenuLineText),
"%*s%s%*s",
SpaceLeft, "", // Left padding
MenuInfo->MenuItemList[MenuItemNumber],
SpaceRight, ""); // Right padding
#ifndef _M_ARM
/* Check if using centered menu, and add spaces on the right if so */
if (UiCenterMenu)
{
for (i = 0; i < SpaceRight; i++)
strcat(MenuLineText, " ");
}
#endif
/* If it is a separator */
if (MenuInfo->MenuItemList[MenuItemNumber] == NULL)
{
/* Make it a separator line and use menu colors */
memset(MenuLineText, 0, sizeof(MenuLineText));
memset(MenuLineText, 0xC4, (MenuInfo->Right - MenuInfo->Left - 1));
Attribute = ATTR(UiMenuFgColor, UiMenuBgColor);
}
else if (MenuItemNumber == MenuInfo->SelectedMenuItem)
if (MenuItemNumber == MenuInfo->SelectedMenuItem)
{
/* If this is the selected item, use the selected colors */
Attribute = ATTR(UiSelectedTextColor, UiSelectedTextBgColor);
}
else
{
/* Normal item colors */
Attribute = ATTR(UiTextColor, UiMenuBgColor);
}
/* Draw the item */
UiDrawText(MenuInfo->Left + 1,