backup/planetblupi
1
0
Fork 0
mirror of https://github.com/blupi-games/planetblupi synced 2024-12-30 10:15:36 +01:00
Code Issues Projects Releases Activity

Continue fixing positions for right2left layout (hebrew)

Browse Source
This commit is contained in:
Mathieu Schroeter 2019-02-02 14:54:45 +01:00
parent 5c7d61fb44
commit c82e04d558
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/event.cxx
View File

@ -2349,10 +2349,14 @@ CEvent::DrawButtons ()
rect.bottom = POSDRAWY; rect.bottom = POSDRAWY;
m_pPixmap->DrawPart (-1, CHBACK, pos, rect); m_pPixmap->DrawPart (-1, CHBACK, pos, rect);
pos.x = POSDRAWX + 20; pos.x = POSDRAWX_ + 20;
pos.y = POSDRAWY + 4; pos.y = POSDRAWY + 4;
if (IsRightReading ())
pos.x = LXIMAGE () - pos.x;
DrawTextRect (m_pPixmap, pos, m_libelle, 0, FONTLITTLE, 1); DrawTextRect (m_pPixmap, pos, m_libelle, 0, FONTLITTLE, 1);
pos.x = POSDRAWX + DIMDRAWX / 2 + 20; pos.x = POSDRAWX_ + DIMDRAWX / 2 + 20;
if (IsRightReading ())
pos.x = LXIMAGE () - pos.x;
DrawTextRect (m_pPixmap, pos, m_libelle, 0, FONTLITTLE, 2); DrawTextRect (m_pPixmap, pos, m_libelle, 0, FONTLITTLE, 2);
pos.x = POSDRAWX + DIMDRAWX / 2 - DIMBUTTONX / 2; pos.x = POSDRAWX + DIMDRAWX / 2 - DIMBUTTONX / 2;
@ -2365,6 +2369,8 @@ CEvent::DrawButtons ()
{ {
m_posHelpButton.x = POSDRAWX + DIMDRAWX - DIMBUTTONX - 2; m_posHelpButton.x = POSDRAWX + DIMDRAWX - DIMBUTTONX - 2;
m_posHelpButton.y = lg - DIMBUTTONY - 2; m_posHelpButton.y = lg - DIMBUTTONY - 2;
if (IsRightReading ())
m_posHelpButton.x = POSDRAWX + 2;
m_pPixmap->DrawIcon ( m_pPixmap->DrawIcon (
-1, CHBUTTON, m_bHiliHelpButton ? 2 : 0, m_posHelpButton); -1, CHBUTTON, m_bHiliHelpButton ? 2 : 0, m_posHelpButton);
if (m_bInfoHelp) if (m_bInfoHelp)
@ -2378,6 +2384,8 @@ CEvent::DrawButtons ()
{ {
pos.x = POSDRAWX + DIMDRAWX / 2 - DIMBUTTONX / 2; pos.x = POSDRAWX + DIMDRAWX / 2 - DIMBUTTONX / 2;
pos.y = -12; pos.y = -12;
if (IsRightReading ())
m_posHelpButton.x = POSDRAWX + 2;
m_pPixmap->DrawIcon (-1, CHBUTTON, m_bHiliInfoButton ? 75 : 74, pos); m_pPixmap->DrawIcon (-1, CHBUTTON, m_bHiliInfoButton ? 75 : 74, pos);
} }
m_posInfoButton = pos; m_posInfoButton = pos;
@ -2395,6 +2403,8 @@ CEvent::DrawButtons ()
pos.x = 420 + LXOFFSET (); pos.x = 420 + LXOFFSET ();
pos.y = 8; pos.y = 8;
if (IsRightReading ())
pos.x = LXIMAGE () - pos.x;
DrawText (m_pPixmap, pos, res); DrawText (m_pPixmap, pos, res);
for (i = 0; i < 10; i++) for (i = 0; i < 10; i++)
@ -2406,9 +2416,13 @@ CEvent::DrawButtons ()
lg = GetTextWidth (text); lg = GetTextWidth (text);
pos.x = (420 + 460) / 2 - lg / 2 + LXOFFSET (); pos.x = (420 + 460) / 2 - lg / 2 + LXOFFSET ();
pos.y = 30 + 12 + 42 * i; pos.y = 30 + 12 + 42 * i;
if (IsRightReading ())
pos.x = LXIMAGE () - pos.x;
DrawText (m_pPixmap, pos, text, FONTSLIM); DrawText (m_pPixmap, pos, text, FONTSLIM);
pos.x = 420 + 50 + LXOFFSET (); pos.x = 420 + 50 + LXOFFSET ();
if (IsRightReading ())
pos.x = LXIMAGE () - pos.x;
if (world >= 0) if (world >= 0)
{ {
@ -3077,6 +3091,7 @@ CEvent::EventButtons (const SDL_Event & event, Point pos)
{ {
snprintf (m_textToolTips, sizeof (m_textToolTips), "%s", text); snprintf (m_textToolTips, sizeof (m_textToolTips), "%s", text);
lg = GetTextWidth (m_textToolTips); lg = GetTextWidth (m_textToolTips);
lg = IsRightReading () ? -lg : lg;
test.x += (DIMJAUGEX - lg) / 2; test.x += (DIMJAUGEX - lg) / 2;
test.y += 4; test.y += 4;
m_posToolTips = test; m_posToolTips = test;