From 0710d1c425e267a4ca786bb77b6accea45ebe7a3 Mon Sep 17 00:00:00 2001 From: Gleb Mazovetskiy Date: Tue, 1 Oct 2019 09:14:22 +0100 Subject: [PATCH] DiabloUI: Rename UiButton to UiArtTextButton --- SourceX/DiabloUI/diabloui.cpp | 12 ++++++------ SourceX/DiabloUI/dialogs.cpp | 10 +++++----- SourceX/DiabloUI/selconn.cpp | 6 +++--- SourceX/DiabloUI/selgame.cpp | 4 ++-- SourceX/DiabloUI/selhero.cpp | 20 ++++++++++---------- SourceX/DiabloUI/ui_item.h | 14 +++++++------- 6 files changed, 33 insertions(+), 33 deletions(-) diff --git a/SourceX/DiabloUI/diabloui.cpp b/SourceX/DiabloUI/diabloui.cpp index 78b72a71a..1c67e3b98 100644 --- a/SourceX/DiabloUI/diabloui.cpp +++ b/SourceX/DiabloUI/diabloui.cpp @@ -658,7 +658,7 @@ void Render(const UiImage &ui_image) DrawArt(ui_image.rect.x, ui_image.rect.y, ui_image.art, ui_image.frame, ui_image.rect.w); } -void Render(const UiButton &ui_button) +void Render(const UiArtTextButton &ui_button) { DrawArtStr(ui_button.text, ui_button.rect, ui_button.flags); } @@ -727,8 +727,8 @@ void RenderItem(const UiItem &item) case UI_IMAGE: Render(item.image); break; - case UI_BUTTON: - Render(item.button); + case UI_ART_TEXT_BUTTON: + Render(item.art_text_button); break; case UI_LIST: Render(item.list); @@ -742,7 +742,7 @@ void RenderItem(const UiItem &item) } } -bool HandleMouseEventButton(const SDL_Event &event, const UiButton &ui_button) +bool HandleMouseEventArtTextButton(const SDL_Event &event, const UiArtTextButton &ui_button) { if (event.type != SDL_MOUSEBUTTONDOWN || event.button.button != SDL_BUTTON_LEFT) return false; @@ -806,8 +806,8 @@ bool HandleMouseEvent(const SDL_Event &event, const UiItem &item) if (item.has_flag(UIS_HIDDEN) || !IsInsideRect(event, item.rect())) return false; switch (item.type) { - case UI_BUTTON: - return HandleMouseEventButton(event, item.button); + case UI_ART_TEXT_BUTTON: + return HandleMouseEventArtTextButton(event, item.art_text_button); case UI_LIST: return HandleMouseEventList(event, item.list); case UI_SCROLLBAR: diff --git a/SourceX/DiabloUI/dialogs.cpp b/SourceX/DiabloUI/dialogs.cpp index 5eb754c44..1958dbd80 100644 --- a/SourceX/DiabloUI/dialogs.cpp +++ b/SourceX/DiabloUI/dialogs.cpp @@ -19,21 +19,21 @@ void DialogActionCancel() UiItem OKCANCEL_DIALOG[] = { UiImage(&dialogArt, { 180, 168, 280, 144 }), UiText(dialogMessage, { 200, 180, 240, 80 }, UIS_CENTER), - UiButton("OK", &DialogActionOK, { 200, 265, 110, 28 }, UIS_SML1), - UiButton("Cancel", &DialogActionCancel, { 330, 265, 110, 28 }, UIS_SML2), + UiArtTextButton("OK", &DialogActionOK, { 200, 265, 110, 28 }, UIS_SML1), + UiArtTextButton("Cancel", &DialogActionCancel, { 330, 265, 110, 28 }, UIS_SML2), }; UiItem OK_DIALOG[] = { UiImage(&dialogArt, { 180, 168, 280, 144 }), UiText(dialogMessage, { 200, 180, 240, 80 }, UIS_CENTER), - UiButton("OK", &DialogActionOK, { 200, 265, 110, 28 }, UIS_SML1), + UiArtTextButton("OK", &DialogActionOK, { 200, 265, 110, 28 }, UIS_SML1), }; UiItem PROGRESS_DIALOG[] = { UiImage(&dialogArt, { 180, 168, 280, 144 }), UiText(dialogMessage, { 180, 177, 280, 43 }, UIS_CENTER), UiImage(&progressArt, { 205, 220, 228, 38 }), - UiButton("Cancel", &DialogActionCancel, { 265, 267, 110, 28 }, UIS_SML1), + UiArtTextButton("Cancel", &DialogActionCancel, { 265, 267, 110, 28 }, UIS_SML1), }; UiListItem SELOK_DIALOG_ITEMS[] = { @@ -46,7 +46,7 @@ UiItem SELOK_DIALOG[] = { UiItem SPAWNERR_DIALOG[] = { UiText("The Rogue and Sorcerer are only available in the full retail version of Diablo. For ordering information call (800) 953-SNOW.", { 140, 199, 400, 177 }), - UiButton("OK", &DialogActionOK, { 230, 407, 180, 43 }), + UiArtTextButton("OK", &DialogActionOK, { 230, 407, 180, 43 }), }; } diff --git a/SourceX/DiabloUI/selconn.cpp b/SourceX/DiabloUI/selconn.cpp index ac24b4ee3..8f8f6e1fb 100644 --- a/SourceX/DiabloUI/selconn.cpp +++ b/SourceX/DiabloUI/selconn.cpp @@ -37,10 +37,10 @@ UiItem SELCONNECT_DIALOG[] = { UiText("no gateway needed", { 30, 356, 220, 31 }, UIS_CENTER | UIS_MED), UiText(selconn_Gateway, { 35, 393, 205, 21 }, UIS_CENTER), UiText("Select Connection", { 300, 211, 295, 33 }, UIS_CENTER | UIS_BIG), - UiButton("Change Gateway", nullptr, { 16, 427, 250, 35 }, UIS_CENTER | UIS_VCENTER | UIS_BIG | UIS_GOLD | UIS_HIDDEN), + UiArtTextButton("Change Gateway", nullptr, { 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), - UiButton("OK", &UiFocusNavigationSelect, { 299, 427, 140, 35 }, UIS_CENTER | UIS_VCENTER | UIS_BIG | UIS_GOLD), - UiButton("Cancel", &UiFocusNavigationEsc, { 454, 427, 140, 35 }, UIS_CENTER | UIS_VCENTER | UIS_BIG | 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) }; void selconn_Load() diff --git a/SourceX/DiabloUI/selgame.cpp b/SourceX/DiabloUI/selgame.cpp index be124b187..42becde0f 100644 --- a/SourceX/DiabloUI/selgame.cpp +++ b/SourceX/DiabloUI/selgame.cpp @@ -20,8 +20,8 @@ static _SNETPROGRAMDATA *m_client_info; extern DWORD provider; constexpr UiImage SELGAME_BACKGROUND = UiImage(&ArtBackground, { 0, 0, 640, 480 }); -constexpr UiButton SELGAME_OK = UiButton("OK", &UiFocusNavigationSelect, { 299, 427, 140, 35 }, UIS_CENTER | UIS_VCENTER | UIS_BIG | UIS_GOLD); -constexpr UiButton SELGAME_CANCEL = UiButton("CANCEL", &UiFocusNavigationEsc, { 449, 427, 140, 35 }, UIS_CENTER | UIS_VCENTER | UIS_BIG | UIS_GOLD); +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); UiText SELGAME_DESCRIPTION(selgame_Description, { 35, 256, 205, 192 }); diff --git a/SourceX/DiabloUI/selhero.cpp b/SourceX/DiabloUI/selhero.cpp index 86246670c..1cb8ab1f0 100644 --- a/SourceX/DiabloUI/selhero.cpp +++ b/SourceX/DiabloUI/selhero.cpp @@ -55,13 +55,13 @@ UiItem SELLIST_DIALOG[] = { UiText("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}), - UiButton("OK", &UiFocusNavigationSelect, { 239, 429, 120, 35 }, UIS_CENTER | UIS_BIG | UIS_GOLD), - UiButton("Delete", &selhero_UiFocusNavigationYesNo, { 364, 429, 120, 35 }, UIS_CENTER | UIS_BIG | UIS_DISABLED), - UiButton("Cancel", &UiFocusNavigationEsc, { 489, 429, 120, 35 }, UIS_CENTER | UIS_BIG | UIS_GOLD) + 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) }; UiList *SELLIST_DIALOG_LIST = &SELLIST_DIALOG[1].list; UiScrollBar *SELLIST_SCROLLBAR = &SELLIST_DIALOG[2].scrollbar; -UiButton *SELLIST_DIALOG_DELETE_BUTTON = &SELLIST_DIALOG[4].button; +UiArtTextButton *SELLIST_DIALOG_DELETE_BUTTON = &SELLIST_DIALOG[4].art_text_button; UiListItem SELCLAS_DIALOG_ITEMS[] = { { "Warrior", UI_WARRIOR }, @@ -71,15 +71,15 @@ UiListItem SELCLAS_DIALOG_ITEMS[] = { UiItem SELCLASS_DIALOG[] = { UiText("Choose Class", { 264, 211, 320, 33 }, UIS_CENTER | UIS_BIG), UiList(SELCLAS_DIALOG_ITEMS, 264, 285, 320, 33, UIS_CENTER | UIS_MED | UIS_GOLD), - UiButton("OK", &UiFocusNavigationSelect, { 279, 429, 140, 35 }, UIS_CENTER | UIS_BIG | UIS_GOLD), - UiButton("Cancel", &UiFocusNavigationEsc, { 429, 429, 140, 35 }, UIS_CENTER | UIS_BIG | 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) }; UiItem ENTERNAME_DIALOG[] = { UiText("Enter Name", { 264, 211, 320, 33 }, UIS_CENTER | UIS_BIG), UiEdit(selhero_heroInfo.name, 15, { 265, 317, 320, 33 }, UIS_LIST | UIS_MED | UIS_GOLD), - UiButton("OK", &UiFocusNavigationSelect, { 279, 429, 140, 35 }, UIS_CENTER | UIS_BIG | UIS_GOLD), - UiButton("Cancel", &UiFocusNavigationEsc, { 429, 429, 140, 35 }, UIS_CENTER | UIS_BIG | 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) }; UiListItem SELLOAD_DIALOG_ITEMS[] = { @@ -89,8 +89,8 @@ UiListItem SELLOAD_DIALOG_ITEMS[] = { UiItem SELLOAD_DIALOG[] = { UiText("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), - UiButton("OK", &UiFocusNavigationSelect, { 279, 427, 140, 35 }, UIS_CENTER | UIS_VCENTER | UIS_BIG | UIS_GOLD), - UiButton("Cancel", &UiFocusNavigationEsc, { 429, 427, 140, 35 }, UIS_CENTER | UIS_VCENTER | UIS_BIG | 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) }; } // namespace diff --git a/SourceX/DiabloUI/ui_item.h b/SourceX/DiabloUI/ui_item.h index 517e72a78..c89616628 100644 --- a/SourceX/DiabloUI/ui_item.h +++ b/SourceX/DiabloUI/ui_item.h @@ -13,7 +13,7 @@ namespace dvl { enum UiType { UI_TEXT, UI_IMAGE, - UI_BUTTON, + UI_ART_TEXT_BUTTON, UI_LIST, UI_SCROLLBAR, UI_EDIT, @@ -89,8 +89,8 @@ struct UiText : public UiItemBase { const char *text; }; -struct UiButton : public UiItemBase { - constexpr UiButton(const char *text, void (*action)(), SDL_Rect rect, int flags = 0) +struct UiArtTextButton : public UiItemBase { + constexpr UiArtTextButton(const char *text, void (*action)(), SDL_Rect rect, int flags = 0) : UiItemBase(rect, flags) , text(text) , action(action) @@ -191,9 +191,9 @@ struct UiItem { { } - constexpr UiItem(UiButton button) - : type(UI_BUTTON) - , button(button) + constexpr UiItem(UiArtTextButton art_text_button) + : type(UI_ART_TEXT_BUTTON) + , art_text_button(art_text_button) { } @@ -219,7 +219,7 @@ struct UiItem { union { UiText text; UiImage image; - UiButton button; + UiArtTextButton art_text_button; UiList list; UiScrollBar scrollbar; UiEdit edit;