From ca82f815824a0b7812d1e6d8fe79f730e95dfb6e Mon Sep 17 00:00:00 2001 From: Anders Jenbo Date: Sat, 9 May 2020 12:56:15 +0200 Subject: [PATCH] Move menu elements to the center of the screen Previously the rendering was just shifted which gave the mouse an odd position and made it impossible to place new elements in the left side. --- SourceX/DiabloUI/art_draw.cpp | 1 - SourceX/DiabloUI/credits.cpp | 4 +-- SourceX/DiabloUI/diabloui.cpp | 2 +- SourceX/DiabloUI/diabloui.h | 2 +- SourceX/DiabloUI/dialogs.cpp | 14 ++++---- SourceX/DiabloUI/mainmenu.cpp | 2 +- SourceX/DiabloUI/progress.cpp | 6 ++-- SourceX/DiabloUI/selconn.cpp | 22 ++++++------- SourceX/DiabloUI/selgame.cpp | 30 ++++++++--------- SourceX/DiabloUI/selhero.cpp | 60 +++++++++++++++++----------------- SourceX/DiabloUI/selok.cpp | 10 +++--- SourceX/DiabloUI/selyesno.cpp | 6 ++-- SourceX/DiabloUI/text_draw.cpp | 2 -- SourceX/DiabloUI/title.cpp | 2 +- 14 files changed, 80 insertions(+), 83 deletions(-) diff --git a/SourceX/DiabloUI/art_draw.cpp b/SourceX/DiabloUI/art_draw.cpp index 99999b619..6c0a64812 100644 --- a/SourceX/DiabloUI/art_draw.cpp +++ b/SourceX/DiabloUI/art_draw.cpp @@ -9,7 +9,6 @@ extern unsigned int pal_surface_palette_version; void DrawArt(int screenX, int screenY, Art *art, int nFrame, decltype(SDL_Rect().w) srcW, decltype(SDL_Rect().h) srcH) { - screenX += PANEL_LEFT; if (screenY >= SCREEN_HEIGHT || screenX >= SCREEN_WIDTH || art->surface == NULL) return; diff --git a/SourceX/DiabloUI/credits.cpp b/SourceX/DiabloUI/credits.cpp index e0dccd4d7..e8404f695 100644 --- a/SourceX/DiabloUI/credits.cpp +++ b/SourceX/DiabloUI/credits.cpp @@ -208,7 +208,7 @@ void CreditsRenderer::Render() return; prev_offset_y_ = offset_y; - DrawArt(0, 0, &ArtBackground); + DrawArt(PANEL_LEFT + 0, 0, &ArtBackground); if (font == NULL) return; @@ -243,7 +243,7 @@ void CreditsRenderer::Render() if (line.palette_version != pal_surface_palette_version) line = PrepareLine(line.index); - decltype(SDL_Rect().x) dest_x = VIEWPORT.x + 31; + decltype(SDL_Rect().x) dest_x = PANEL_LEFT + VIEWPORT.x + 31; if (CREDITS_LINES[line.index][0] == '\t') dest_x += 40; diff --git a/SourceX/DiabloUI/diabloui.cpp b/SourceX/DiabloUI/diabloui.cpp index 91b103b45..3e00d5bda 100644 --- a/SourceX/DiabloUI/diabloui.cpp +++ b/SourceX/DiabloUI/diabloui.cpp @@ -551,7 +551,7 @@ BOOL UiCreatePlayerDescription(_uiheroinfo *info, DWORD mode, char *desc) int GetCenterOffset(int w, int bw) { if (bw == 0) { - bw = PANEL_WIDTH; + bw = SCREEN_WIDTH; } return (bw - w) / 2; diff --git a/SourceX/DiabloUI/diabloui.h b/SourceX/DiabloUI/diabloui.h index 0a3815f27..f76b6ed3a 100644 --- a/SourceX/DiabloUI/diabloui.h +++ b/SourceX/DiabloUI/diabloui.h @@ -29,7 +29,7 @@ extern Art ArtCursor; extern Art ArtHero; extern bool gbSpawned; -constexpr auto MAINMENU_BACKGROUND = UiImage(&ArtBackground, { 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT }); +constexpr auto MAINMENU_BACKGROUND = UiImage(&ArtBackground, { PANEL_LEFT, 0, 640, 480 }); constexpr auto MAINMENU_LOGO = UiImage(&ArtLogos[LOGO_MED], /*animated=*/true, /*frame=*/0, { 0, 0, 0, 0 }, UIS_CENTER); template diff --git a/SourceX/DiabloUI/dialogs.cpp b/SourceX/DiabloUI/dialogs.cpp index 970365b45..0027f85ef 100644 --- a/SourceX/DiabloUI/dialogs.cpp +++ b/SourceX/DiabloUI/dialogs.cpp @@ -32,19 +32,19 @@ void DialogActionOK() dialogEnd = true; } -constexpr auto DIALOG_ART_L = UiImage(&dialogArt, { 127, 100, 385, 280 }); +constexpr auto DIALOG_ART_L = UiImage(&dialogArt, { PANEL_LEFT + 127, 100, 385, 280 }); UiItem OK_DIALOG[] = { - UiImage(&dialogArt, { 180, 168, 280, 144 }), - UiText(dialogText, { 200, 211, 240, 80 }, UIS_CENTER), - MakeSmlButton("OK", &DialogActionOK, 265, 265), + UiImage(&dialogArt, { PANEL_LEFT + 180, 168, 280, 144 }), + UiText(dialogText, { PANEL_LEFT + 200, 211, 240, 80 }, UIS_CENTER), + MakeSmlButton("OK", &DialogActionOK, PANEL_LEFT + 265, 265), }; UiItem OK_DIALOG_WITH_CAPTION[] = { DIALOG_ART_L, - UiText(dialogText, SDL_Color{ 255, 255, 0, 0 }, { 147, 110, 345, 20 }, UIS_CENTER), - UiText(dialogCaption, { 147, 141, 345, 190 }, UIS_CENTER), - MakeSmlButton("OK", &DialogActionOK, 264, 335), + UiText(dialogText, SDL_Color{ 255, 255, 0, 0 }, { PANEL_LEFT + 147, 110, 345, 20 }, UIS_CENTER), + UiText(dialogCaption, { PANEL_LEFT + 147, 141, 345, 190 }, UIS_CENTER), + MakeSmlButton("OK", &DialogActionOK, PANEL_LEFT + 264, 335), }; // clang-format off diff --git a/SourceX/DiabloUI/mainmenu.cpp b/SourceX/DiabloUI/mainmenu.cpp index e4adb94c8..7af5f56f1 100644 --- a/SourceX/DiabloUI/mainmenu.cpp +++ b/SourceX/DiabloUI/mainmenu.cpp @@ -18,7 +18,7 @@ UiListItem MAINMENU_DIALOG_ITEMS[] = { UiItem MAINMENU_DIALOG[] = { MAINMENU_BACKGROUND, MAINMENU_LOGO, - UiList(MAINMENU_DIALOG_ITEMS, 64, 192, 510, 43, UIS_HUGE | UIS_GOLD | UIS_CENTER), + UiList(MAINMENU_DIALOG_ITEMS, PANEL_LEFT + 64, 192, 510, 43, UIS_HUGE | UIS_GOLD | UIS_CENTER), UiArtText(NULL, { 17, 444, 605, 21 }, UIS_SMALL) }; diff --git a/SourceX/DiabloUI/progress.cpp b/SourceX/DiabloUI/progress.cpp index f6e8307ca..db6c9ab49 100644 --- a/SourceX/DiabloUI/progress.cpp +++ b/SourceX/DiabloUI/progress.cpp @@ -26,9 +26,9 @@ void DialogActionCancel() // TODO use PROGRESS_DIALOG for rendering the progressbar or delete it UiItem PROGRESS_DIALOG[] = { - UiImage(&dialogArt, { 180, 168, 280, 144 }), - UiText(dialogText, { 180, 177, 280, 43 }, UIS_CENTER), - UiImage(&progressArt, { 205, 220, 228, 38 }), + UiImage(&dialogArt, { PANEL_LEFT + 180, 168, 280, 144 }), + UiText(dialogText, { PANEL_LEFT + 180, 177, 280, 43 }, UIS_CENTER), + UiImage(&progressArt, { PANEL_LEFT + 205, 220, 228, 38 }), MakeSmlButton("Cancel", &DialogActionCancel, 330, 265), }; diff --git a/SourceX/DiabloUI/selconn.cpp b/SourceX/DiabloUI/selconn.cpp index 674f1e31e..5df4cfa73 100644 --- a/SourceX/DiabloUI/selconn.cpp +++ b/SourceX/DiabloUI/selconn.cpp @@ -18,7 +18,7 @@ _SNETVERSIONDATA *selconn_FileInfo; int provider; -UiArtText SELCONNECT_DIALOG_DESCRIPTION(selconn_Description, { 35, 275, 205, 66 }); +UiArtText SELCONNECT_DIALOG_DESCRIPTION(selconn_Description, { PANEL_LEFT + 35, 275, 205, 66 }); // Should be in the same order than conn_type (See enums.h) UiListItem SELCONN_DIALOG_ITEMS[] = { @@ -34,17 +34,17 @@ UiListItem SELCONN_DIALOG_ITEMS[] = { UiItem SELCONNECT_DIALOG[] = { MAINMENU_BACKGROUND, MAINMENU_LOGO, - UiArtText("Multi Player Game", { 24, 161, 590, 35 }, UIS_CENTER | UIS_BIG), - UiArtText(selconn_MaxPlayers, { 35, 218, 205, 21 }), - UiArtText("Requirements:", { 35, 256, 205, 21 }), + UiArtText("Multi Player Game", { PANEL_LEFT + 24, 161, 590, 35 }, UIS_CENTER | UIS_BIG), + UiArtText(selconn_MaxPlayers, { PANEL_LEFT + 35, 218, 205, 21 }), + UiArtText("Requirements:", { PANEL_LEFT + 35, 256, 205, 21 }), SELCONNECT_DIALOG_DESCRIPTION, - UiArtText("no gateway needed", { 30, 356, 220, 31 }, UIS_CENTER | UIS_MED), - UiArtText(selconn_Gateway, { 35, 393, 205, 21 }, UIS_CENTER), - UiArtText("Select Connection", { 300, 211, 295, 33 }, UIS_CENTER | UIS_BIG), - UiArtTextButton("Change Gateway", NULL, { 16, 427, 250, 35 }, UIS_CENTER | UIS_VCENTER | UIS_BIG | UIS_GOLD | UIS_HIDDEN), - UiList(SELCONN_DIALOG_ITEMS, 305, 256, 285, 26, UIS_CENTER | UIS_VCENTER | UIS_GOLD), - UiArtTextButton("OK", &UiFocusNavigationSelect, { 299, 427, 140, 35 }, UIS_CENTER | UIS_VCENTER | UIS_BIG | UIS_GOLD), - UiArtTextButton("Cancel", &UiFocusNavigationEsc, { 454, 427, 140, 35 }, UIS_CENTER | UIS_VCENTER | UIS_BIG | UIS_GOLD) + UiArtText("no gateway needed", { PANEL_LEFT + 30, 356, 220, 31 }, UIS_CENTER | UIS_MED), + UiArtText(selconn_Gateway, { PANEL_LEFT + 35, 393, 205, 21 }, UIS_CENTER), + UiArtText("Select Connection", { PANEL_LEFT + 300, 211, 295, 33 }, UIS_CENTER | UIS_BIG), + UiArtTextButton("Change Gateway", NULL, { PANEL_LEFT + 16, 427, 250, 35 }, UIS_CENTER | UIS_VCENTER | UIS_BIG | UIS_GOLD | UIS_HIDDEN), + UiList(SELCONN_DIALOG_ITEMS, PANEL_LEFT + 305, 256, 285, 26, UIS_CENTER | UIS_VCENTER | UIS_GOLD), + UiArtTextButton("OK", &UiFocusNavigationSelect, { PANEL_LEFT + 299, 427, 140, 35 }, UIS_CENTER | UIS_VCENTER | UIS_BIG | UIS_GOLD), + UiArtTextButton("Cancel", &UiFocusNavigationEsc, { PANEL_LEFT + 454, 427, 140, 35 }, UIS_CENTER | UIS_VCENTER | UIS_BIG | UIS_GOLD) }; void selconn_Load() diff --git a/SourceX/DiabloUI/selgame.cpp b/SourceX/DiabloUI/selgame.cpp index d43d2a7ee..27cd0ee98 100644 --- a/SourceX/DiabloUI/selgame.cpp +++ b/SourceX/DiabloUI/selgame.cpp @@ -23,10 +23,10 @@ int heroLevel; static _SNETPROGRAMDATA *m_client_info; extern int provider; -constexpr UiArtTextButton SELGAME_OK = UiArtTextButton("OK", &UiFocusNavigationSelect, { 299, 427, 140, 35 }, UIS_CENTER | UIS_VCENTER | UIS_BIG | UIS_GOLD); -constexpr UiArtTextButton SELGAME_CANCEL = UiArtTextButton("CANCEL", &UiFocusNavigationEsc, { 449, 427, 140, 35 }, UIS_CENTER | UIS_VCENTER | UIS_BIG | UIS_GOLD); +constexpr UiArtTextButton SELGAME_OK = UiArtTextButton("OK", &UiFocusNavigationSelect, { PANEL_LEFT + 299, 427, 140, 35 }, UIS_CENTER | UIS_VCENTER | UIS_BIG | UIS_GOLD); +constexpr UiArtTextButton SELGAME_CANCEL = UiArtTextButton("CANCEL", &UiFocusNavigationEsc, { PANEL_LEFT + 449, 427, 140, 35 }, UIS_CENTER | UIS_VCENTER | UIS_BIG | UIS_GOLD); -UiArtText SELGAME_DESCRIPTION(selgame_Description, { 35, 256, 205, 192 }); +UiArtText SELGAME_DESCRIPTION(selgame_Description, { PANEL_LEFT + 35, 256, 205, 192 }); namespace { @@ -39,17 +39,17 @@ UiListItem SELDIFF_DIALOG_ITEMS[] = { UiItem SELDIFF_DIALOG[] = { MAINMENU_BACKGROUND, MAINMENU_LOGO, - UiArtText(title, { 24, 161, 590, 35 }, UIS_CENTER | UIS_BIG), - UiArtText(selgame_Label, { 34, 211, 205, 33 }, UIS_CENTER | UIS_BIG), // DIFF + UiArtText(title, { PANEL_LEFT + 24, 161, 590, 35 }, UIS_CENTER | UIS_BIG), + UiArtText(selgame_Label, { PANEL_LEFT + 34, 211, 205, 33 }, UIS_CENTER | UIS_BIG), // DIFF SELGAME_DESCRIPTION, - UiArtText("Select Difficulty", { 299, 211, 295, 35 }, UIS_CENTER | UIS_BIG), - UiList(SELDIFF_DIALOG_ITEMS, 300, 282, 295, 26, UIS_CENTER | UIS_MED | UIS_GOLD), + UiArtText("Select Difficulty", { PANEL_LEFT + 299, 211, 295, 35 }, UIS_CENTER | UIS_BIG), + UiList(SELDIFF_DIALOG_ITEMS, PANEL_LEFT + 300, 282, 295, 26, UIS_CENTER | UIS_MED | UIS_GOLD), SELGAME_OK, SELGAME_CANCEL, }; -constexpr UiArtText SELUDPGAME_TITLE = UiArtText(title, { 24, 161, 590, 35 }, UIS_CENTER | UIS_BIG); -constexpr UiArtText SELUDPGAME_DESCRIPTION_LABEL = UiArtText("Description:", { 35, 211, 205, 192 }, UIS_MED); +constexpr UiArtText SELUDPGAME_TITLE = UiArtText(title, { PANEL_LEFT + 24, 161, 590, 35 }, UIS_CENTER | UIS_BIG); +constexpr UiArtText SELUDPGAME_DESCRIPTION_LABEL = UiArtText("Description:", { PANEL_LEFT + 35, 211, 205, 192 }, UIS_MED); UiListItem SELUDPGAME_DIALOG_ITEMS[] = { { "Create Game", 0 }, @@ -61,8 +61,8 @@ UiItem SELUDPGAME_DIALOG[] = { SELUDPGAME_TITLE, SELUDPGAME_DESCRIPTION_LABEL, SELGAME_DESCRIPTION, - UiArtText("Select Action", { 300, 211, 295, 33 }, UIS_CENTER | UIS_BIG), - UiList(SELUDPGAME_DIALOG_ITEMS, 305, 255, 285, 26, UIS_CENTER | UIS_MED | UIS_GOLD), + UiArtText("Select Action", { PANEL_LEFT + 300, 211, 295, 33 }, UIS_CENTER | UIS_BIG), + UiList(SELUDPGAME_DIALOG_ITEMS, PANEL_LEFT + 305, 255, 285, 26, UIS_CENTER | UIS_MED | UIS_GOLD), SELGAME_OK, SELGAME_CANCEL, }; @@ -73,8 +73,8 @@ UiItem ENTERIP_DIALOG[] = { SELUDPGAME_TITLE, SELUDPGAME_DESCRIPTION_LABEL, SELGAME_DESCRIPTION, - UiArtText("Enter IP", { 305, 211, 285, 33 }, UIS_CENTER | UIS_BIG), - UiEdit(selgame_Ip, 128, { 305, 314, 285, 33 }, UIS_MED | UIS_GOLD), + UiArtText("Enter IP", { PANEL_LEFT + 305, 211, 285, 33 }, UIS_CENTER | UIS_BIG), + UiEdit(selgame_Ip, 128, { PANEL_LEFT + 305, 314, 285, 33 }, UIS_MED | UIS_GOLD), SELGAME_OK, SELGAME_CANCEL, }; @@ -85,8 +85,8 @@ UiItem ENTERPASSWORD_DIALOG[] = { SELUDPGAME_TITLE, SELUDPGAME_DESCRIPTION_LABEL, SELGAME_DESCRIPTION, - UiArtText("Enter Password", { 305, 211, 285, 33 }, UIS_CENTER | UIS_BIG), - UiEdit(selgame_Password, 15, { 305, 314, 285, 33 }, UIS_MED | UIS_GOLD), + UiArtText("Enter Password", { PANEL_LEFT + 305, 211, 285, 33 }, UIS_CENTER | UIS_BIG), + UiEdit(selgame_Password, 15, { PANEL_LEFT + 305, 314, 285, 33 }, UIS_MED | UIS_GOLD), SELGAME_OK, SELGAME_CANCEL, }; diff --git a/SourceX/DiabloUI/selhero.cpp b/SourceX/DiabloUI/selhero.cpp index 0e679b71f..d5e130972 100644 --- a/SourceX/DiabloUI/selhero.cpp +++ b/SourceX/DiabloUI/selhero.cpp @@ -41,29 +41,29 @@ namespace { UiItem SELHERO_DIALOG[] = { MAINMENU_BACKGROUND, MAINMENU_LOGO, - UiArtText(title, { 24, 161, 590, 35 }, UIS_CENTER | UIS_BIG), - UiImage(&ArtHero, UI_NUM_CLASSES, { 30, 211, 180, 76 }), - UiArtText("Level:", { 39, 323, 110, 21 }, UIS_RIGHT), - UiArtText(textStats[0], { 159, 323, 40, 21 }, UIS_CENTER), - UiArtText("Strength:", { 39, 358, 110, 21 }, UIS_RIGHT), - UiArtText(textStats[1], { 159, 358, 40, 21 }, UIS_CENTER), - UiArtText("Magic:", { 39, 380, 110, 21 }, UIS_RIGHT), - UiArtText(textStats[2], { 159, 380, 40, 21 }, UIS_CENTER), - UiArtText("Dexterity:", { 39, 401, 110, 21 }, UIS_RIGHT), - UiArtText(textStats[3], { 159, 401, 40, 21 }, UIS_CENTER), - UiArtText("Vitality:", { 39, 422, 110, 21 }, UIS_RIGHT), - UiArtText(textStats[4], { 159, 422, 40, 21 }, UIS_CENTER), + UiArtText(title, { PANEL_LEFT + 24, 161, 590, 35 }, UIS_CENTER | UIS_BIG), + UiImage(&ArtHero, UI_NUM_CLASSES, { PANEL_LEFT + 30, 211, 180, 76 }), + UiArtText("Level:", { PANEL_LEFT + 39, 323, 110, 21 }, UIS_RIGHT), + UiArtText(textStats[0], { PANEL_LEFT + 159, 323, 40, 21 }, UIS_CENTER), + UiArtText("Strength:", { PANEL_LEFT + 39, 358, 110, 21 }, UIS_RIGHT), + UiArtText(textStats[1], { PANEL_LEFT + 159, 358, 40, 21 }, UIS_CENTER), + UiArtText("Magic:", { PANEL_LEFT + 39, 380, 110, 21 }, UIS_RIGHT), + UiArtText(textStats[2], { PANEL_LEFT + 159, 380, 40, 21 }, UIS_CENTER), + UiArtText("Dexterity:", { PANEL_LEFT + 39, 401, 110, 21 }, UIS_RIGHT), + UiArtText(textStats[3], { PANEL_LEFT + 159, 401, 40, 21 }, UIS_CENTER), + UiArtText("Vitality:", { PANEL_LEFT + 39, 422, 110, 21 }, UIS_RIGHT), + UiArtText(textStats[4], { PANEL_LEFT + 159, 422, 40, 21 }, UIS_CENTER), }; UiImage *SELHERO_DIALOG_HERO_IMG = &SELHERO_DIALOG[3].image; UiListItem SELLIST_DIALOG_ITEMS[kMaxViewportItems]; UiItem SELLIST_DIALOG[] = { - UiArtText("Select Hero", { 264, 211, 320, 33 }, UIS_CENTER | UIS_BIG), - UiList(SELLIST_DIALOG_ITEMS, 265, 256, 320, 26, UIS_CENTER | UIS_MED | UIS_GOLD), - MakeScrollBar({ 585, 244, 25, 178 }), - UiArtTextButton("OK", &UiFocusNavigationSelect, { 239, 429, 120, 35 }, UIS_CENTER | UIS_BIG | UIS_GOLD), - UiArtTextButton("Delete", &selhero_UiFocusNavigationYesNo, { 364, 429, 120, 35 }, UIS_CENTER | UIS_BIG | UIS_DISABLED), - UiArtTextButton("Cancel", &UiFocusNavigationEsc, { 489, 429, 120, 35 }, UIS_CENTER | UIS_BIG | UIS_GOLD) + UiArtText("Select Hero", { PANEL_LEFT + 264, 211, 320, 33 }, UIS_CENTER | UIS_BIG), + UiList(SELLIST_DIALOG_ITEMS, PANEL_LEFT + 265, 256, 320, 26, UIS_CENTER | UIS_MED | UIS_GOLD), + MakeScrollBar({ PANEL_LEFT + 585, 244, 25, 178 }), + UiArtTextButton("OK", &UiFocusNavigationSelect, { PANEL_LEFT + 239, 429, 120, 35 }, UIS_CENTER | UIS_BIG | UIS_GOLD), + UiArtTextButton("Delete", &selhero_UiFocusNavigationYesNo, { PANEL_LEFT + 364, 429, 120, 35 }, UIS_CENTER | UIS_BIG | UIS_DISABLED), + UiArtTextButton("Cancel", &UiFocusNavigationEsc, { PANEL_LEFT + 489, 429, 120, 35 }, UIS_CENTER | UIS_BIG | UIS_GOLD) }; UiList *SELLIST_DIALOG_LIST = &SELLIST_DIALOG[1].list; UiScrollBar *SELLIST_SCROLLBAR = &SELLIST_DIALOG[2].scrollbar; @@ -75,17 +75,17 @@ UiListItem SELCLAS_DIALOG_ITEMS[] = { { "Sorcerer", UI_SORCERER } }; UiItem SELCLASS_DIALOG[] = { - UiArtText("Choose Class", { 264, 211, 320, 33 }, UIS_CENTER | UIS_BIG), - UiList(SELCLAS_DIALOG_ITEMS, 264, 285, 320, 33, UIS_CENTER | UIS_MED | UIS_GOLD), - UiArtTextButton("OK", &UiFocusNavigationSelect, { 279, 429, 140, 35 }, UIS_CENTER | UIS_BIG | UIS_GOLD), - UiArtTextButton("Cancel", &UiFocusNavigationEsc, { 429, 429, 140, 35 }, UIS_CENTER | UIS_BIG | UIS_GOLD) + UiArtText("Choose Class", { PANEL_LEFT + 264, 211, 320, 33 }, UIS_CENTER | UIS_BIG), + UiList(SELCLAS_DIALOG_ITEMS, PANEL_LEFT + 264, 285, 320, 33, UIS_CENTER | UIS_MED | UIS_GOLD), + UiArtTextButton("OK", &UiFocusNavigationSelect, { PANEL_LEFT + 279, 429, 140, 35 }, UIS_CENTER | UIS_BIG | UIS_GOLD), + UiArtTextButton("Cancel", &UiFocusNavigationEsc, { PANEL_LEFT + 429, 429, 140, 35 }, UIS_CENTER | UIS_BIG | UIS_GOLD) }; UiItem ENTERNAME_DIALOG[] = { - UiArtText("Enter Name", { 264, 211, 320, 33 }, UIS_CENTER | UIS_BIG), - UiEdit(selhero_heroInfo.name, 15, { 265, 317, 320, 33 }, UIS_MED | UIS_GOLD), - UiArtTextButton("OK", &UiFocusNavigationSelect, { 279, 429, 140, 35 }, UIS_CENTER | UIS_BIG | UIS_GOLD), - UiArtTextButton("Cancel", &UiFocusNavigationEsc, { 429, 429, 140, 35 }, UIS_CENTER | UIS_BIG | UIS_GOLD) + UiArtText("Enter Name", { PANEL_LEFT + 264, 211, 320, 33 }, UIS_CENTER | UIS_BIG), + UiEdit(selhero_heroInfo.name, 15, { PANEL_LEFT + 265, 317, 320, 33 }, UIS_MED | UIS_GOLD), + UiArtTextButton("OK", &UiFocusNavigationSelect, { PANEL_LEFT + 279, 429, 140, 35 }, UIS_CENTER | UIS_BIG | UIS_GOLD), + UiArtTextButton("Cancel", &UiFocusNavigationEsc, { PANEL_LEFT + 429, 429, 140, 35 }, UIS_CENTER | UIS_BIG | UIS_GOLD) }; UiListItem SELLOAD_DIALOG_ITEMS[] = { @@ -93,10 +93,10 @@ UiListItem SELLOAD_DIALOG_ITEMS[] = { { "New Game", 1 } }; UiItem SELLOAD_DIALOG[] = { - UiArtText("Save File Exists", { 264, 211, 320, 33 }, UIS_CENTER | UIS_BIG), - UiList(SELLOAD_DIALOG_ITEMS, 265, 285, 320, 33, UIS_CENTER | UIS_MED | UIS_GOLD), - UiArtTextButton("OK", &UiFocusNavigationSelect, { 279, 427, 140, 35 }, UIS_CENTER | UIS_VCENTER | UIS_BIG | UIS_GOLD), - UiArtTextButton("Cancel", &UiFocusNavigationEsc, { 429, 427, 140, 35 }, UIS_CENTER | UIS_VCENTER | UIS_BIG | UIS_GOLD) + UiArtText("Save File Exists", { PANEL_LEFT + 264, 211, 320, 33 }, UIS_CENTER | UIS_BIG), + UiList(SELLOAD_DIALOG_ITEMS, PANEL_LEFT + 265, 285, 320, 33, UIS_CENTER | UIS_MED | UIS_GOLD), + UiArtTextButton("OK", &UiFocusNavigationSelect, { PANEL_LEFT + 279, 427, 140, 35 }, UIS_CENTER | UIS_VCENTER | UIS_BIG | UIS_GOLD), + UiArtTextButton("Cancel", &UiFocusNavigationEsc, { PANEL_LEFT + 429, 427, 140, 35 }, UIS_CENTER | UIS_VCENTER | UIS_BIG | UIS_GOLD) }; } // namespace diff --git a/SourceX/DiabloUI/selok.cpp b/SourceX/DiabloUI/selok.cpp index 2293ea225..72af8bfa1 100644 --- a/SourceX/DiabloUI/selok.cpp +++ b/SourceX/DiabloUI/selok.cpp @@ -36,16 +36,16 @@ UiListItem SELOK_DIALOG_ITEMS[] = { UiItem SELOK_DIALOG[] = { MAINMENU_BACKGROUND, MAINMENU_LOGO, - UiArtText(selok_title, { 24, 161, 590, 35 }, UIS_CENTER | UIS_BIG), - UiArtText(dialogText, { 140, 210, 560, 168 }, UIS_MED), - UiList(SELOK_DIALOG_ITEMS, 230, 390, 180, 35, UIS_CENTER | UIS_BIG | UIS_GOLD) + UiArtText(selok_title, { PANEL_LEFT + 24, 161, 590, 35 }, UIS_CENTER | UIS_BIG), + UiArtText(dialogText, { PANEL_LEFT + 140, 210, 560, 168 }, UIS_MED), + UiList(SELOK_DIALOG_ITEMS, PANEL_LEFT + 230, 390, 180, 35, UIS_CENTER | UIS_BIG | UIS_GOLD) }; UiItem SPAWNERR_DIALOG[] = { MAINMENU_BACKGROUND, MAINMENU_LOGO, - UiArtText(dialogText, { 140, 197, 560, 168 }, UIS_MED), - UiList(SELOK_DIALOG_ITEMS, 230, 390, 180, 35, UIS_CENTER | UIS_BIG | UIS_GOLD) + UiArtText(dialogText, { PANEL_LEFT + 140, 197, 560, 168 }, UIS_MED), + UiList(SELOK_DIALOG_ITEMS, PANEL_LEFT + 230, 390, 180, 35, UIS_CENTER | UIS_BIG | UIS_GOLD) }; void UiSelOkDialog(const char *title, const char *body, bool background) diff --git a/SourceX/DiabloUI/selyesno.cpp b/SourceX/DiabloUI/selyesno.cpp index bb6a5574a..e97871b5d 100644 --- a/SourceX/DiabloUI/selyesno.cpp +++ b/SourceX/DiabloUI/selyesno.cpp @@ -19,9 +19,9 @@ UiListItem SELYESNO_DIALOG_ITEMS[] = { UiItem SELYESNO_DIALOG[] = { MAINMENU_BACKGROUND, MAINMENU_LOGO, - UiArtText(selyesno_title, { 24, 161, 590, 35 }, UIS_CENTER | UIS_BIG), - UiArtText(selyesno_confirmationMessage, { 120, 236, 280, 168 }, UIS_MED), - UiList(SELYESNO_DIALOG_ITEMS, 230, 390, 180, 35, UIS_CENTER | UIS_BIG | UIS_GOLD) + UiArtText(selyesno_title, { PANEL_LEFT + 24, 161, 590, 35 }, UIS_CENTER | UIS_BIG), + UiArtText(selyesno_confirmationMessage, { PANEL_LEFT + 120, 236, 280, 168 }, UIS_MED), + UiList(SELYESNO_DIALOG_ITEMS, PANEL_LEFT + 230, 390, 180, 35, UIS_CENTER | UIS_BIG | UIS_GOLD) }; UiArtText *SELYESNO_DIALOG_CONFIRMATION_MESSAGE = &SELYESNO_DIALOG[3].art_text; diff --git a/SourceX/DiabloUI/text_draw.cpp b/SourceX/DiabloUI/text_draw.cpp index 54514af9d..b35da541a 100644 --- a/SourceX/DiabloUI/text_draw.cpp +++ b/SourceX/DiabloUI/text_draw.cpp @@ -38,8 +38,6 @@ void DrawTTF(const char *text, const SDL_Rect &rectIn, int flags, TtfSurfaceCache **render_cache) { SDL_Rect rect(rectIn); - if(! (flags & UIS_CENTER)) - rect.x += PANEL_LEFT; if (font == NULL || text == NULL || *text == '\0') return; if (*render_cache == NULL) { diff --git a/SourceX/DiabloUI/title.cpp b/SourceX/DiabloUI/title.cpp index 2c683d236..f7601e98d 100644 --- a/SourceX/DiabloUI/title.cpp +++ b/SourceX/DiabloUI/title.cpp @@ -21,7 +21,7 @@ void UiTitleDialog() UiItem TITLESCREEN_DIALOG[] = { MAINMENU_BACKGROUND, UiImage(&ArtLogos[LOGO_BIG], /*animated=*/true, /*frame=*/0, { 0, 182, 0, 0 }, UIS_CENTER), - UiArtText("Copyright \xA9 1996-2001 Blizzard Entertainment", { 49, 410, 550, 26 }, UIS_MED | UIS_CENTER) + UiArtText("Copyright \xA9 1996-2001 Blizzard Entertainment", { PANEL_LEFT + 49, 410, 550, 26 }, UIS_MED | UIS_CENTER) }; title_Load();