mpo/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2024-12-22 09:39:43 +01:00
Code Issues Releases Wiki Activity

Fix orientation of levels list

Browse source 
I forgot to add the PR_RTL_XFLIP flag to these menu options, so they
were always left-aligned, no matter what.

What actually took me a bit to figure out was how to make the level
completion stars work regardless of the contents of the title - the
stars should always be to the left of the title in an LTR language, and
always to the right of the title in an RTL language. Level titles can
contain bidi characters regardless of the level's rtl flag being set,
so I just let bidi handle all the level menu options, with some control
characters to make sure everything always appears in the correct order.
This commit is contained in:
Dav999 2024-01-05 02:04:27 +01:00 committed by Misa Elizabeth Kai
parent 3f8333400f
commit 5620edeb6b
1 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
desktop_version/src/Game.cpp
View file

@ -28,6 +28,7 @@
#include "Screen.h" #include "Screen.h"
#include "Script.h" #include "Script.h"
#include "Unused.h" #include "Unused.h"
#include "UTF8.h"
#include "UtilityClass.h" #include "UtilityClass.h"
#include "VFormat.h" #include "VFormat.h"
#include "Vlogging.h" #include "Vlogging.h"
@ -6346,8 +6347,22 @@ void Game::createmenu( enum Menu::MenuName t, bool samemenu/*= false*/ )
prefix = ""; prefix = "";
break; break;
} }
/* We have to make sure the stars and spaces are consistently on the
* correct side of the title, no matter what bidi characters are in there.
* So just always let the bidi engine handle it, with a few control chars. */
char text[MENU_TEXT_BYTES]; char text[MENU_TEXT_BYTES];
SDL_snprintf(text, sizeof(text), "%s%s", prefix, cl.ListOfMetaData[i].title.c_str()); SDL_snprintf(
text, sizeof(text),
"%s%s%s%s%s",
// LRM or RLM depending on UI language, to make the stars aligned to left or right
UTF8_encode(font::is_rtl(PR_FONT_INTERFACE) ? 0x200F : 0x200E).bytes,
prefix,
// FIRST STRONG ISOLATE, to start an isolated block oriented however bidi sees fit
UTF8_encode(0x2068).bytes,
cl.ListOfMetaData[i].title.c_str(),
// POP DIRECTIONAL ISOLATE, exit isolated level title
UTF8_encode(0x2069).bytes
);
for (size_t ii = 0; text[ii] != '\0'; ++ii) for (size_t ii = 0; text[ii] != '\0'; ++ii)
{ {
text[ii] = SDL_tolower(text[ii]); text[ii] = SDL_tolower(text[ii]);
@ -6355,9 +6370,9 @@ void Game::createmenu( enum Menu::MenuName t, bool samemenu/*= false*/ )
option( option(
text, text,
true, true,
cl.ListOfMetaData[i].title_is_gettext ? PR_FONT_INTERFACE : PR_FONT_IDX( (cl.ListOfMetaData[i].title_is_gettext ? PR_FONT_INTERFACE : PR_FONT_IDX(
cl.ListOfMetaData[i].level_main_font_idx, cl.ListOfMetaData[i].rtl cl.ListOfMetaData[i].level_main_font_idx, font::is_rtl(PR_FONT_INTERFACE)
) )) | PR_RTL_XFLIP
); );
} }
} }