edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-10-21 00:08:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
ddnet/src/game/editor/popups.cpp

2252 lines
72 KiB
C++
Raw Normal View History

Updated copyrights
2010-11-20 10:37:14 +00:00
/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
/* If you are missing that file, acquire a complete release at teeworlds.com. */
added auto mapping feature by LordSkelethom
2011-07-08 23:09:06 +00:00
Implement an HSV picker for color of quad points
2015-08-17 12:10:08 +00:00
#include <base/color.h>
added auto mapping feature by LordSkelethom
2011-07-08 23:09:06 +00:00
added output level for console print function, categorised the debug messages and merged them into the new functionality. Closes #8
2010-08-17 22:06:00 +00:00
#include <engine/console.h>
copied refactor to trunk
2010-05-29 07:25:38 +00:00
#include <engine/graphics.h>
#include <engine/input.h>
#include <engine/keys.h>
Organize game-client includes
2022-05-29 16:33:38 +00:00
#include <engine/shared/config.h>
added a popup to create a new folder in the editor's file dialog and show an error if it fails
2011-03-20 21:53:50 +00:00
#include <engine/storage.h>
Editor: used max int value for goto min and max coordinates
2022-09-15 17:31:56 +00:00
#include <limits>
added auto mapping feature by LordSkelethom
2011-07-08 23:09:06 +00:00
Refactor editor layer image selection popup using `CScrollRegion` The width of the popup and list are also slightly increased to better support images with longer names.
2022-08-13 11:59:01 +00:00
#include <game/client/ui_scrollregion.h>
renamed editor files
2011-04-19 08:34:51 +00:00
#include "editor.h"
editor update and other stuff
2008-01-17 23:09:49 +00:00
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
CUI::EPopupMenuFunctionResult CEditor::PopupMenuFile(void *pContext, CUIRect View, bool Active)
editor update and other stuff
2008-01-17 23:09:49 +00:00
{
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
CEditor *pEditor = static_cast<CEditor *>(pContext);
editor update and other stuff
2008-01-17 23:09:49 +00:00
Move all editor popup function definitions to `popups.cpp` Editor code for the popups should be located in `popups.cpp`.
2023-04-01 20:24:12 +00:00
static int s_NewMapButton = 0;
static int s_SaveButton = 0;
static int s_SaveAsButton = 0;
static int s_SaveCopyButton = 0;
static int s_OpenButton = 0;
static int s_OpenCurrentMapButton = 0;
static int s_AppendButton = 0;
Move "Map details" button from editor file browser to file menu There is not enought space for the button in the file browser on 4:3 and 5:4 resolutions. The button fits in the file menu, as it allows to adjust the map details which are specific to the current map file.
2023-04-02 18:15:45 +00:00
static int s_MapInfoButton = 0;
Move all editor popup function definitions to `popups.cpp` Editor code for the popups should be located in `popups.cpp`.
2023-04-01 20:24:12 +00:00
static int s_ExitButton = 0;
CUIRect Slot;
View.HSplitTop(12.0f, &Slot, &View);
if(pEditor->DoButton_MenuItem(&s_NewMapButton, "New", 0, &Slot, 0, "Creates a new map (ctrl+n)"))
{
if(pEditor->HasUnsavedData())
{
pEditor->m_PopupEventType = POPEVENT_NEW;
pEditor->m_PopupEventActivated = true;
}
else
{
pEditor->Reset();
pEditor->m_aFileName[0] = 0;
}
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
return CUI::POPUP_CLOSE_CURRENT;
Move all editor popup function definitions to `popups.cpp` Editor code for the popups should be located in `popups.cpp`.
2023-04-01 20:24:12 +00:00
}
Refactor `CEditor::PopupMenuFile`
2023-04-01 21:17:37 +00:00
View.HSplitTop(10.0f, nullptr, &View);
Move all editor popup function definitions to `popups.cpp` Editor code for the popups should be located in `popups.cpp`.
2023-04-01 20:24:12 +00:00
View.HSplitTop(12.0f, &Slot, &View);
if(pEditor->DoButton_MenuItem(&s_OpenButton, "Load", 0, &Slot, 0, "Opens a map for editing (ctrl+l)"))
{
if(pEditor->HasUnsavedData())
{
pEditor->m_PopupEventType = POPEVENT_LOAD;
pEditor->m_PopupEventActivated = true;
}
else
pEditor->InvokeFileDialog(IStorage::TYPE_ALL, FILETYPE_MAP, "Load map", "Load", "maps", "", pEditor->CallbackOpenMap, pEditor);
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
return CUI::POPUP_CLOSE_CURRENT;
Move all editor popup function definitions to `popups.cpp` Editor code for the popups should be located in `popups.cpp`.
2023-04-01 20:24:12 +00:00
}
Refactor `CEditor::PopupMenuFile`
2023-04-01 21:17:37 +00:00
View.HSplitTop(2.0f, nullptr, &View);
Move all editor popup function definitions to `popups.cpp` Editor code for the popups should be located in `popups.cpp`.
2023-04-01 20:24:12 +00:00
View.HSplitTop(12.0f, &Slot, &View);
if(pEditor->DoButton_MenuItem(&s_OpenCurrentMapButton, "Load Current Map", 0, &Slot, 0, "Opens the current in game map for editing (ctrl+alt+l)"))
{
if(pEditor->HasUnsavedData())
{
pEditor->m_PopupEventType = POPEVENT_LOADCURRENT;
pEditor->m_PopupEventActivated = true;
}
else
{
pEditor->LoadCurrentMap();
}
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
return CUI::POPUP_CLOSE_CURRENT;
Move all editor popup function definitions to `popups.cpp` Editor code for the popups should be located in `popups.cpp`.
2023-04-01 20:24:12 +00:00
}
Refactor `CEditor::PopupMenuFile`
2023-04-01 21:17:37 +00:00
View.HSplitTop(10.0f, nullptr, &View);
Move all editor popup function definitions to `popups.cpp` Editor code for the popups should be located in `popups.cpp`.
2023-04-01 20:24:12 +00:00
View.HSplitTop(12.0f, &Slot, &View);
if(pEditor->DoButton_MenuItem(&s_AppendButton, "Append", 0, &Slot, 0, "Opens a map and adds everything from that map to the current one (ctrl+a)"))
{
pEditor->InvokeFileDialog(IStorage::TYPE_ALL, FILETYPE_MAP, "Append map", "Append", "maps", "", pEditor->CallbackAppendMap, pEditor);
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
return CUI::POPUP_CLOSE_CURRENT;
Move all editor popup function definitions to `popups.cpp` Editor code for the popups should be located in `popups.cpp`.
2023-04-01 20:24:12 +00:00
}
Refactor `CEditor::PopupMenuFile`
2023-04-01 21:17:37 +00:00
View.HSplitTop(10.0f, nullptr, &View);
Move all editor popup function definitions to `popups.cpp` Editor code for the popups should be located in `popups.cpp`.
2023-04-01 20:24:12 +00:00
View.HSplitTop(12.0f, &Slot, &View);
if(pEditor->DoButton_MenuItem(&s_SaveButton, "Save", 0, &Slot, 0, "Saves the current map (ctrl+s)"))
{
if(pEditor->m_aFileName[0] && pEditor->m_ValidSaveFilename)
{
Refactor `str_copy` usages and buffer sizes in editor Use templated `str_copy` function in most cases to specify the correct buffer size. Fixes two cases where the buffer size was hard-coded to a number. Fix buffer size not being checked when copying auto mapper configuration name. Loading an auto mapper configuration with a name longer than 128 bytes could cause an out-of-bounds write. Increase sizes of some text buffers that were potentially too small.
2023-06-13 15:44:30 +00:00
str_copy(pEditor->m_aFileSaveName, pEditor->m_aFileName);
Move all editor popup function definitions to `popups.cpp` Editor code for the popups should be located in `popups.cpp`.
2023-04-01 20:24:12 +00:00
pEditor->m_PopupEventType = POPEVENT_SAVE;
pEditor->m_PopupEventActivated = true;
}
else
pEditor->InvokeFileDialog(IStorage::TYPE_SAVE, FILETYPE_MAP, "Save map", "Save", "maps", "", pEditor->CallbackSaveMap, pEditor);
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
return CUI::POPUP_CLOSE_CURRENT;
Move all editor popup function definitions to `popups.cpp` Editor code for the popups should be located in `popups.cpp`.
2023-04-01 20:24:12 +00:00
}
Refactor `CEditor::PopupMenuFile`
2023-04-01 21:17:37 +00:00
View.HSplitTop(2.0f, nullptr, &View);
Move all editor popup function definitions to `popups.cpp` Editor code for the popups should be located in `popups.cpp`.
2023-04-01 20:24:12 +00:00
View.HSplitTop(12.0f, &Slot, &View);
if(pEditor->DoButton_MenuItem(&s_SaveAsButton, "Save As", 0, &Slot, 0, "Saves the current map under a new name (ctrl+shift+s)"))
{
pEditor->InvokeFileDialog(IStorage::TYPE_SAVE, FILETYPE_MAP, "Save map", "Save", "maps", "", pEditor->CallbackSaveMap, pEditor);
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
return CUI::POPUP_CLOSE_CURRENT;
Move all editor popup function definitions to `popups.cpp` Editor code for the popups should be located in `popups.cpp`.
2023-04-01 20:24:12 +00:00
}
Refactor `CEditor::PopupMenuFile`
2023-04-01 21:17:37 +00:00
View.HSplitTop(2.0f, nullptr, &View);
Move all editor popup function definitions to `popups.cpp` Editor code for the popups should be located in `popups.cpp`.
2023-04-01 20:24:12 +00:00
View.HSplitTop(12.0f, &Slot, &View);
if(pEditor->DoButton_MenuItem(&s_SaveCopyButton, "Save Copy", 0, &Slot, 0, "Saves a copy of the current map under a new name (ctrl+shift+alt+s)"))
{
pEditor->InvokeFileDialog(IStorage::TYPE_SAVE, FILETYPE_MAP, "Save map", "Save", "maps", "", pEditor->CallbackSaveCopyMap, pEditor);
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
return CUI::POPUP_CLOSE_CURRENT;
Move all editor popup function definitions to `popups.cpp` Editor code for the popups should be located in `popups.cpp`.
2023-04-01 20:24:12 +00:00
}
Move "Map details" button from editor file browser to file menu There is not enought space for the button in the file browser on 4:3 and 5:4 resolutions. The button fits in the file menu, as it allows to adjust the map details which are specific to the current map file.
2023-04-02 18:15:45 +00:00
View.HSplitTop(10.0f, nullptr, &View);
View.HSplitTop(12.0f, &Slot, &View);
if(pEditor->DoButton_MenuItem(&s_MapInfoButton, "Map details", 0, &Slot, 0, "Adjust the map details of the current map"))
{
const CUIRect *pScreen = pEditor->UI()->Screen();
Refactor `CEditorMap::CMapInfo` Reduce duplicate code. Make code more similar to upstream.
2023-04-22 14:43:58 +00:00
pEditor->m_Map.m_MapInfoTmp.Copy(pEditor->m_Map.m_MapInfo);
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
static SPopupMenuId s_PopupMapInfoId;
Move "Map details" button from editor file browser to file menu There is not enought space for the button in the file browser on 4:3 and 5:4 resolutions. The button fits in the file menu, as it allows to adjust the map details which are specific to the current map file.
2023-04-02 18:15:45 +00:00
constexpr float PopupWidth = 400.0f;
constexpr float PopupHeight = 170.0f;
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
pEditor->UI()->DoPopupMenu(&s_PopupMapInfoId, pScreen->w / 2.0f - PopupWidth / 2.0f, pScreen->h / 2.0f - PopupHeight / 2.0f, PopupWidth, PopupHeight, pEditor, PopupMapInfo);
Move "Map details" button from editor file browser to file menu There is not enought space for the button in the file browser on 4:3 and 5:4 resolutions. The button fits in the file menu, as it allows to adjust the map details which are specific to the current map file.
2023-04-02 18:15:45 +00:00
pEditor->UI()->SetActiveItem(nullptr);
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
return CUI::POPUP_CLOSE_CURRENT;
Move "Map details" button from editor file browser to file menu There is not enought space for the button in the file browser on 4:3 and 5:4 resolutions. The button fits in the file menu, as it allows to adjust the map details which are specific to the current map file.
2023-04-02 18:15:45 +00:00
}
Refactor `CEditor::PopupMenuFile`
2023-04-01 21:17:37 +00:00
View.HSplitTop(10.0f, nullptr, &View);
Move all editor popup function definitions to `popups.cpp` Editor code for the popups should be located in `popups.cpp`.
2023-04-01 20:24:12 +00:00
View.HSplitTop(12.0f, &Slot, &View);
if(pEditor->DoButton_MenuItem(&s_ExitButton, "Exit", 0, &Slot, 0, "Exits from the editor"))
{
if(pEditor->HasUnsavedData())
{
pEditor->m_PopupEventType = POPEVENT_EXIT;
pEditor->m_PopupEventActivated = true;
}
else
g_Config.m_ClEditor = 0;
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
return CUI::POPUP_CLOSE_CURRENT;
Move all editor popup function definitions to `popups.cpp` Editor code for the popups should be located in `popups.cpp`.
2023-04-01 20:24:12 +00:00
}
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
return CUI::POPUP_KEEP_OPEN;
Move all editor popup function definitions to `popups.cpp` Editor code for the popups should be located in `popups.cpp`.
2023-04-01 20:24:12 +00:00
}
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
CUI::EPopupMenuFunctionResult CEditor::PopupMenuTools(void *pContext, CUIRect View, bool Active)
Move all editor popup function definitions to `popups.cpp` Editor code for the popups should be located in `popups.cpp`.
2023-04-01 20:24:12 +00:00
{
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
CEditor *pEditor = static_cast<CEditor *>(pContext);
Move all editor popup function definitions to `popups.cpp` Editor code for the popups should be located in `popups.cpp`.
2023-04-01 20:24:12 +00:00
CUIRect Slot;
View.HSplitTop(12.0f, &Slot, &View);
static int s_RemoveUnusedEnvelopesButton = 0;
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
static CUI::SConfirmPopupContext s_ConfirmPopupContext;
Move all editor popup function definitions to `popups.cpp` Editor code for the popups should be located in `popups.cpp`.
2023-04-01 20:24:12 +00:00
if(pEditor->DoButton_MenuItem(&s_RemoveUnusedEnvelopesButton, "Remove unused envelopes", 0, &Slot, 0, "Removes all unused envelopes from the map"))
{
s_ConfirmPopupContext.Reset();
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
s_ConfirmPopupContext.YesNoButtons();
Move all editor popup function definitions to `popups.cpp` Editor code for the popups should be located in `popups.cpp`.
2023-04-01 20:24:12 +00:00
str_copy(s_ConfirmPopupContext.m_aMessage, "Are you sure that you want to remove all unused envelopes from this map?");
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
pEditor->UI()->ShowPopupConfirm(Slot.x + Slot.w, Slot.y, &s_ConfirmPopupContext);
Move all editor popup function definitions to `popups.cpp` Editor code for the popups should be located in `popups.cpp`.
2023-04-01 20:24:12 +00:00
}
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
if(s_ConfirmPopupContext.m_Result == CUI::SConfirmPopupContext::CONFIRMED)
Move all editor popup function definitions to `popups.cpp` Editor code for the popups should be located in `popups.cpp`.
2023-04-01 20:24:12 +00:00
pEditor->RemoveUnusedEnvelopes();
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
if(s_ConfirmPopupContext.m_Result != CUI::SConfirmPopupContext::UNSET)
Move all editor popup function definitions to `popups.cpp` Editor code for the popups should be located in `popups.cpp`.
2023-04-01 20:24:12 +00:00
{
s_ConfirmPopupContext.Reset();
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
return CUI::POPUP_CLOSE_CURRENT;
Move all editor popup function definitions to `popups.cpp` Editor code for the popups should be located in `popups.cpp`.
2023-04-01 20:24:12 +00:00
}
move unused, entities, goto, border to menu
2023-04-29 12:05:01 +00:00
static int s_BorderButton = 0;
add spacing and group unused selector code
2023-04-29 13:07:25 +00:00
View.HSplitTop(2.0f, nullptr, &View);
move unused, entities, goto, border to menu
2023-04-29 12:05:01 +00:00
View.HSplitTop(12.0f, &Slot, &View);
show current entity type
2023-05-01 16:02:53 +00:00
if(pEditor->DoButton_MenuItem(&s_BorderButton, "Place Border", 0, &Slot, 0, "Place tiles in a 2-tile wide border at the edges of the layer"))
move unused, entities, goto, border to menu
2023-04-29 12:05:01 +00:00
{
CLayerTiles *pT = (CLayerTiles *)pEditor->GetSelectedLayerType(0, LAYERTYPE_TILES);
if(pT && !pT->m_Tele && !pT->m_Speedup && !pT->m_Switch && !pT->m_Front && !pT->m_Tune)
{
pEditor->m_PopupEventType = POPEVENT_PLACE_BORDER_TILES;
pEditor->m_PopupEventActivated = true;
}
else
{
static CUI::SMessagePopupContext s_MessagePopupContext;
s_MessagePopupContext.DefaultColor(pEditor->m_pTextRender);
str_copy(s_MessagePopupContext.m_aMessage, "No tile layer selected");
pEditor->UI()->ShowPopupMessage(Slot.x, Slot.y + Slot.h, &s_MessagePopupContext);
}
}
static int s_GotoButton = 0;
add spacing and group unused selector code
2023-04-29 13:07:25 +00:00
View.HSplitTop(2.0f, nullptr, &View);
move unused, entities, goto, border to menu
2023-04-29 12:05:01 +00:00
View.HSplitTop(12.0f, &Slot, &View);
if(pEditor->DoButton_MenuItem(&s_GotoButton, "Goto XY", 0, &Slot, 0, "Go to a specified coordinate point on the map"))
{
static SPopupMenuId s_PopupGotoId;
pEditor->UI()->DoPopupMenu(&s_PopupGotoId, Slot.x, Slot.y + Slot.h, 120, 52, pEditor, PopupGoto);
}
return CUI::POPUP_KEEP_OPEN;
}
static int EntitiesListdirCallback(const char *pName, int IsDir, int StorageType, void *pUser)
{
CEditor *pEditor = (CEditor *)pUser;
if(!IsDir && str_endswith(pName, ".png"))
{
std::string Name = pName;
pEditor->m_vSelectEntitiesFiles.push_back(Name.substr(0, Name.length() - 4));
}
return 0;
}
CUI::EPopupMenuFunctionResult CEditor::PopupMenuSettings(void *pContext, CUIRect View, bool Active)
{
CEditor *pEditor = static_cast<CEditor *>(pContext);
CUIRect Slot;
View.HSplitTop(12.0f, &Slot, &View);
static int s_EntitiesButtonID = 0;
show current entity type
2023-05-01 16:02:53 +00:00
char aButtonText[64];
str_format(aButtonText, sizeof(aButtonText), "Entities: %s", pEditor->m_SelectEntitiesImage.c_str());
if(pEditor->DoButton_MenuItem(&s_EntitiesButtonID, aButtonText, 0, &Slot, 0, "Choose game layer entities image for different gametypes"))
move unused, entities, goto, border to menu
2023-04-29 12:05:01 +00:00
{
pEditor->m_vSelectEntitiesFiles.clear();
pEditor->Storage()->ListDirectory(IStorage::TYPE_ALL, "editor/entities", EntitiesListdirCallback, pEditor);
std::sort(pEditor->m_vSelectEntitiesFiles.begin(), pEditor->m_vSelectEntitiesFiles.end());
static SPopupMenuId s_PopupEntitiesId;
pEditor->UI()->DoPopupMenu(&s_PopupEntitiesId, Slot.x, Slot.y + Slot.h, 250, pEditor->m_vSelectEntitiesFiles.size() * 14.0f + 10.0f, pEditor, PopupEntities);
}
move coloring and info to settings
2023-05-01 20:44:03 +00:00
View.HSplitTop(2.0f, nullptr, &View);
View.HSplitTop(12.0f, &Slot, &View);
{
Slot.VMargin(5.0f, &Slot);
CUIRect Label, Selector;
Slot.VSplitMid(&Label, &Selector);
CUIRect No, Yes;
Selector.VSplitMid(&No, &Yes);
enable brush coloring -> brush coloring
2023-05-16 20:24:26 +00:00
pEditor->UI()->DoLabel(&Label, "Brush coloring", 10.0f, TEXTALIGN_ML);
move coloring and info to settings
2023-05-01 20:44:03 +00:00
static int s_ButtonNo = 0;
static int s_ButtonYes = 0;
if(pEditor->DoButton_ButtonDec(&s_ButtonNo, "No", !pEditor->m_BrushColorEnabled, &No, 0, "Disable brush coloring"))
{
pEditor->m_BrushColorEnabled = false;
}
if(pEditor->DoButton_ButtonInc(&s_ButtonYes, "Yes", pEditor->m_BrushColorEnabled, &Yes, 0, "Enable brush coloring"))
{
pEditor->m_BrushColorEnabled = true;
}
}
add spacing and group unused selector code
2023-04-29 13:07:25 +00:00
View.HSplitTop(2.0f, nullptr, &View);
move unused, entities, goto, border to menu
2023-04-29 12:05:01 +00:00
View.HSplitTop(12.0f, &Slot, &View);
{
add spacing and group unused selector code
2023-04-29 13:07:25 +00:00
Slot.VMargin(5.0f, &Slot);
CUIRect Label, Selector;
Slot.VSplitMid(&Label, &Selector);
CUIRect No, Yes;
Selector.VSplitMid(&No, &Yes);
pEditor->UI()->DoLabel(&Label, "Allow unused", 10.0f, TEXTALIGN_ML);
static int s_ButtonNo = 0;
static int s_ButtonYes = 0;
if(pEditor->DoButton_ButtonDec(&s_ButtonNo, "No", !pEditor->m_AllowPlaceUnusedTiles, &No, 0, "[ctrl+u] Disallow placing unused tiles"))
{
pEditor->m_AllowPlaceUnusedTiles = false;
}
if(pEditor->DoButton_ButtonInc(&s_ButtonYes, "Yes", pEditor->m_AllowPlaceUnusedTiles, &Yes, 0, "[ctrl+u] Allow placing unused tiles"))
{
pEditor->m_AllowPlaceUnusedTiles = true;
}
move unused, entities, goto, border to menu
2023-04-29 12:05:01 +00:00
}
move coloring and info to settings
2023-05-01 20:44:03 +00:00
View.HSplitTop(2.0f, nullptr, &View);
View.HSplitTop(12.0f, &Slot, &View);
{
Slot.VMargin(5.0f, &Slot);
CUIRect Label, Selector;
Slot.VSplitMid(&Label, &Selector);
CUIRect Off, Dec, Hex;
Selector.VSplitLeft(Selector.w / 3.0f, &Off, &Selector);
Selector.VSplitMid(&Dec, &Hex);
pEditor->UI()->DoLabel(&Label, "Show Info", 10.0f, TEXTALIGN_ML);
static int s_ButtonOff = 0;
static int s_ButtonDec = 0;
static int s_ButtonHex = 0;
modified some files as asked
2023-05-22 18:20:45 +00:00
if(pEditor->DoButton_ButtonDec(&s_ButtonOff, "Off", pEditor->m_ShowTileInfo == SHOW_TILE_OFF, &Off, 0, "Do not show tile information"))
move coloring and info to settings
2023-05-01 20:44:03 +00:00
{
modified some files as asked
2023-05-22 18:20:45 +00:00
pEditor->m_ShowTileInfo = SHOW_TILE_OFF;
move coloring and info to settings
2023-05-01 20:44:03 +00:00
pEditor->m_ShowEnvelopePreview = SHOWENV_NONE;
}
Made sugested changes
2023-05-23 18:16:42 +00:00
if(pEditor->DoButton_Ex(&s_ButtonDec, "Dec", pEditor->m_ShowTileInfo == SHOW_TILE_DECIMAL, &Dec, 0, "[ctrl+i] Show tile information", IGraphics::CORNER_NONE))
move coloring and info to settings
2023-05-01 20:44:03 +00:00
{
replaced second enum
2023-05-22 12:46:25 +00:00
pEditor->m_ShowTileInfo = SHOW_TILE_DECIMAL;
move coloring and info to settings
2023-05-01 20:44:03 +00:00
pEditor->m_ShowEnvelopePreview = SHOWENV_NONE;
}
modified some files as asked
2023-05-22 18:20:45 +00:00
if(pEditor->DoButton_ButtonInc(&s_ButtonHex, "Hex", pEditor->m_ShowTileInfo == SHOW_TILE_HEXADECIMAL, &Hex, 0, "[ctrl+shift+i] Show tile information in hexadecimal"))
move coloring and info to settings
2023-05-01 20:44:03 +00:00
{
modified some files as asked
2023-05-22 18:20:45 +00:00
pEditor->m_ShowTileInfo = SHOW_TILE_HEXADECIMAL;
move coloring and info to settings
2023-05-01 20:44:03 +00:00
pEditor->m_ShowEnvelopePreview = SHOWENV_NONE;
}
}
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
return CUI::POPUP_KEEP_OPEN;
Move all editor popup function definitions to `popups.cpp` Editor code for the popups should be located in `popups.cpp`.
2023-04-01 20:24:12 +00:00
}
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
CUI::EPopupMenuFunctionResult CEditor::PopupGroup(void *pContext, CUIRect View, bool Active)
editor update and other stuff
2008-01-17 23:09:49 +00:00
{
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
CEditor *pEditor = static_cast<CEditor *>(pContext);
editor update and other stuff
2008-01-17 23:09:49 +00:00
// remove group button
copied refactor to trunk
2010-05-29 07:25:38 +00:00
CUIRect Button;
View.HSplitBottom(12.0f, &View, &Button);
static int s_DeleteButton = 0;
added "Whitespace and line Endings cleanup" by GreYFoX
2011-04-13 18:37:12 +00:00
removed the option to delete the game layer and group
2008-03-02 15:53:53 +00:00
// don't allow deletion of game group
made game tile construction in the editor more usable
2011-02-18 09:49:54 +00:00
if(pEditor->m_Map.m_pGameGroup != pEditor->GetSelectedGroup())
editor update and other stuff
2008-01-17 23:09:49 +00:00
{
removed localisation in the editor
2011-03-20 16:04:03 +00:00
if(pEditor->DoButton_Editor(&s_DeleteButton, "Delete group", 0, &Button, 0, "Delete group"))
made game tile construction in the editor more usable
2011-02-18 09:49:54 +00:00
{
pEditor->m_Map.DeleteGroup(pEditor->m_SelectedGroup);
Run clang-format Purely automatic change. In case of conflict with this change, apply the other change and rerun the formatting to restore it: $ python scripts/fix_style.py
2020-09-26 19:41:58 +00:00
pEditor->m_SelectedGroup = maximum(0, pEditor->m_SelectedGroup - 1);
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
return CUI::POPUP_CLOSE_CURRENT;
made game tile construction in the editor more usable
2011-02-18 09:49:54 +00:00
}
}
else
{
Fix some editor popup
2014-12-01 19:35:30 +00:00
if(pEditor->DoButton_Editor(&s_DeleteButton, "Clean up game tiles", 0, &Button, 0, "Removes game tiles that aren't based on a layer"))
made game tile construction in the editor more usable
2011-02-18 09:49:54 +00:00
{
// gather all tile layers
More vector naming format
2022-06-15 17:34:41 +00:00
std::vector<CLayerTiles *> vpLayers;
Format vector variables names (fixes #5209)
2022-06-11 19:38:18 +00:00
for(auto &pLayer : pEditor->m_Map.m_pGameGroup->m_vpLayers)
made game tile construction in the editor more usable
2011-02-18 09:49:54 +00:00
{
Use std::vector instead of array in editor
2022-05-24 09:24:33 +00:00
if(pLayer != pEditor->m_Map.m_pGameLayer && pLayer->m_Type == LAYERTYPE_TILES)
More vector naming format
2022-06-15 17:34:41 +00:00
vpLayers.push_back(static_cast<CLayerTiles *>(pLayer));
made game tile construction in the editor more usable
2011-02-18 09:49:54 +00:00
}
// search for unneeded game tiles
Huge variable naming format Fix pointer and pointer array variable naming Huge renaming to match our rules Used regex: (?!(return|delete)\b)\b\w+ (m_|ms_|g_|gs_|s_)[^a]\w+\[ (?!(return|delete)\b)\b\w+ (?!(m_|ms_|g_|gs_|s_))[^a]\w+\[ Further format static variables Format almost all pointer names accordingly Used regex: (?!(return)\b)\b\w+ \*(?!(m_p|p|s_p|m_ap|s_ap|g_p|g_ap|ap|gs_ap|ms_ap|gs_p|ms_p))\w+\b[^:\(p] clang-format Fix CI fail Fix misnamed non pointer as pointer and non array as array Used regex: (?!(return|delete)\b)\b\w+ (m_|ms_|g_|gs_|s_)p\w+\b (?!return\b)\b\w+ (ms_|m_|g_|gs_|s_)a\w+\b[^\[] clang-format Revert to SCREAMING_SNAKE_CASE and reinstate dead code
2022-06-30 22:36:32 +00:00
CLayerTiles *pGameLayer = pEditor->m_Map.m_pGameLayer;
for(int y = 0; y < pGameLayer->m_Height; ++y)
Refactor `CEditor::PopupGroup`
2023-04-01 21:18:27 +00:00
{
Huge variable naming format Fix pointer and pointer array variable naming Huge renaming to match our rules Used regex: (?!(return|delete)\b)\b\w+ (m_|ms_|g_|gs_|s_)[^a]\w+\[ (?!(return|delete)\b)\b\w+ (?!(m_|ms_|g_|gs_|s_))[^a]\w+\[ Further format static variables Format almost all pointer names accordingly Used regex: (?!(return)\b)\b\w+ \*(?!(m_p|p|s_p|m_ap|s_ap|g_p|g_ap|ap|gs_ap|ms_ap|gs_p|ms_p))\w+\b[^:\(p] clang-format Fix CI fail Fix misnamed non pointer as pointer and non array as array Used regex: (?!(return|delete)\b)\b\w+ (m_|ms_|g_|gs_|s_)p\w+\b (?!return\b)\b\w+ (ms_|m_|g_|gs_|s_)a\w+\b[^\[] clang-format Revert to SCREAMING_SNAKE_CASE and reinstate dead code
2022-06-30 22:36:32 +00:00
for(int x = 0; x < pGameLayer->m_Width; ++x)
made game tile construction in the editor more usable
2011-02-18 09:49:54 +00:00
{
Huge variable naming format Fix pointer and pointer array variable naming Huge renaming to match our rules Used regex: (?!(return|delete)\b)\b\w+ (m_|ms_|g_|gs_|s_)[^a]\w+\[ (?!(return|delete)\b)\b\w+ (?!(m_|ms_|g_|gs_|s_))[^a]\w+\[ Further format static variables Format almost all pointer names accordingly Used regex: (?!(return)\b)\b\w+ \*(?!(m_p|p|s_p|m_ap|s_ap|g_p|g_ap|ap|gs_ap|ms_ap|gs_p|ms_p))\w+\b[^:\(p] clang-format Fix CI fail Fix misnamed non pointer as pointer and non array as array Used regex: (?!(return|delete)\b)\b\w+ (m_|ms_|g_|gs_|s_)p\w+\b (?!return\b)\b\w+ (ms_|m_|g_|gs_|s_)a\w+\b[^\[] clang-format Revert to SCREAMING_SNAKE_CASE and reinstate dead code
2022-06-30 22:36:32 +00:00
if(pGameLayer->m_pTiles[y * pGameLayer->m_Width + x].m_Index > static_cast<unsigned char>(TILE_NOHOOK))
made game tile construction in the editor more usable
2011-02-18 09:49:54 +00:00
continue;
bool Found = false;
More vector naming format
2022-06-15 17:34:41 +00:00
for(const auto &pLayer : vpLayers)
made game tile construction in the editor more usable
2011-02-18 09:49:54 +00:00
{
Use std::vector instead of array in editor
2022-05-24 09:24:33 +00:00
if(x < pLayer->m_Width && y < pLayer->m_Height && pLayer->m_pTiles[y * pLayer->m_Width + x].m_Index)
made game tile construction in the editor more usable
2011-02-18 09:49:54 +00:00
{
Found = true;
break;
}
}
if(!Found)
added notification for unsaved map data and a confirmation for overwriting an existing map in the editor. Closes #115
2011-03-21 23:31:42 +00:00
{
Huge variable naming format Fix pointer and pointer array variable naming Huge renaming to match our rules Used regex: (?!(return|delete)\b)\b\w+ (m_|ms_|g_|gs_|s_)[^a]\w+\[ (?!(return|delete)\b)\b\w+ (?!(m_|ms_|g_|gs_|s_))[^a]\w+\[ Further format static variables Format almost all pointer names accordingly Used regex: (?!(return)\b)\b\w+ \*(?!(m_p|p|s_p|m_ap|s_ap|g_p|g_ap|ap|gs_ap|ms_ap|gs_p|ms_p))\w+\b[^:\(p] clang-format Fix CI fail Fix misnamed non pointer as pointer and non array as array Used regex: (?!(return|delete)\b)\b\w+ (m_|ms_|g_|gs_|s_)p\w+\b (?!return\b)\b\w+ (ms_|m_|g_|gs_|s_)a\w+\b[^\[] clang-format Revert to SCREAMING_SNAKE_CASE and reinstate dead code
2022-06-30 22:36:32 +00:00
pGameLayer->m_pTiles[y * pGameLayer->m_Width + x].m_Index = TILE_AIR;
added notification for unsaved map data and a confirmation for overwriting an existing map in the editor. Closes #115
2011-03-21 23:31:42 +00:00
pEditor->m_Map.m_Modified = true;
}
made game tile construction in the editor more usable
2011-02-18 09:49:54 +00:00
}
Refactor `CEditor::PopupGroup`
2023-04-01 21:18:27 +00:00
}
made game tile construction in the editor more usable
2011-02-18 09:49:54 +00:00
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
return CUI::POPUP_CLOSE_CURRENT;
made game tile construction in the editor more usable
2011-02-18 09:49:54 +00:00
}
editor update and other stuff
2008-01-17 23:09:49 +00:00
}
Added tele, speedup, front and switch layer to the client Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-30 21:31:19 +00:00
if(pEditor->GetSelectedGroup()->m_GameGroup && !pEditor->m_Map.m_pTeleLayer)
{
// new tele layer
Refactor `CEditor::PopupGroup`
2023-04-01 21:18:27 +00:00
View.HSplitBottom(5.0f, &View, nullptr);
Added tele, speedup, front and switch layer to the client Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-30 21:31:19 +00:00
View.HSplitBottom(12.0f, &View, &Button);
Fix a few names in popups
2019-11-22 11:28:34 +00:00
static int s_NewTeleLayerButton = 0;
if(pEditor->DoButton_Editor(&s_NewTeleLayerButton, "Add tele layer", 0, &Button, 0, "Creates a new tele layer"))
Added tele, speedup, front and switch layer to the client Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-30 21:31:19 +00:00
{
Huge variable naming format Fix pointer and pointer array variable naming Huge renaming to match our rules Used regex: (?!(return|delete)\b)\b\w+ (m_|ms_|g_|gs_|s_)[^a]\w+\[ (?!(return|delete)\b)\b\w+ (?!(m_|ms_|g_|gs_|s_))[^a]\w+\[ Further format static variables Format almost all pointer names accordingly Used regex: (?!(return)\b)\b\w+ \*(?!(m_p|p|s_p|m_ap|s_ap|g_p|g_ap|ap|gs_ap|ms_ap|gs_p|ms_p))\w+\b[^:\(p] clang-format Fix CI fail Fix misnamed non pointer as pointer and non array as array Used regex: (?!(return|delete)\b)\b\w+ (m_|ms_|g_|gs_|s_)p\w+\b (?!return\b)\b\w+ (ms_|m_|g_|gs_|s_)a\w+\b[^\[] clang-format Revert to SCREAMING_SNAKE_CASE and reinstate dead code
2022-06-30 22:36:32 +00:00
CLayer *pTeleLayer = new CLayerTele(pEditor->m_Map.m_pGameLayer->m_Width, pEditor->m_Map.m_pGameLayer->m_Height);
pEditor->m_Map.MakeTeleLayer(pTeleLayer);
pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->AddLayer(pTeleLayer);
Format vector variables names (fixes #5209)
2022-06-11 19:38:18 +00:00
pEditor->SelectLayer(pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->m_vpLayers.size() - 1);
Added tele, speedup, front and switch layer to the client Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-30 21:31:19 +00:00
pEditor->m_Brush.Clear();
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
return CUI::POPUP_CLOSE_CURRENT;
Added tele, speedup, front and switch layer to the client Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-30 21:31:19 +00:00
}
}
if(pEditor->GetSelectedGroup()->m_GameGroup && !pEditor->m_Map.m_pSpeedupLayer)
{
// new speedup layer
Refactor `CEditor::PopupGroup`
2023-04-01 21:18:27 +00:00
View.HSplitBottom(5.0f, &View, nullptr);
Added tele, speedup, front and switch layer to the client Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-30 21:31:19 +00:00
View.HSplitBottom(12.0f, &View, &Button);
Fix a few names in popups
2019-11-22 11:28:34 +00:00
static int s_NewSpeedupLayerButton = 0;
if(pEditor->DoButton_Editor(&s_NewSpeedupLayerButton, "Add speedup layer", 0, &Button, 0, "Creates a new speedup layer"))
Added tele, speedup, front and switch layer to the client Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-30 21:31:19 +00:00
{
Huge variable naming format Fix pointer and pointer array variable naming Huge renaming to match our rules Used regex: (?!(return|delete)\b)\b\w+ (m_|ms_|g_|gs_|s_)[^a]\w+\[ (?!(return|delete)\b)\b\w+ (?!(m_|ms_|g_|gs_|s_))[^a]\w+\[ Further format static variables Format almost all pointer names accordingly Used regex: (?!(return)\b)\b\w+ \*(?!(m_p|p|s_p|m_ap|s_ap|g_p|g_ap|ap|gs_ap|ms_ap|gs_p|ms_p))\w+\b[^:\(p] clang-format Fix CI fail Fix misnamed non pointer as pointer and non array as array Used regex: (?!(return|delete)\b)\b\w+ (m_|ms_|g_|gs_|s_)p\w+\b (?!return\b)\b\w+ (ms_|m_|g_|gs_|s_)a\w+\b[^\[] clang-format Revert to SCREAMING_SNAKE_CASE and reinstate dead code
2022-06-30 22:36:32 +00:00
CLayer *pSpeedupLayer = new CLayerSpeedup(pEditor->m_Map.m_pGameLayer->m_Width, pEditor->m_Map.m_pGameLayer->m_Height);
pEditor->m_Map.MakeSpeedupLayer(pSpeedupLayer);
pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->AddLayer(pSpeedupLayer);
Format vector variables names (fixes #5209)
2022-06-11 19:38:18 +00:00
pEditor->SelectLayer(pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->m_vpLayers.size() - 1);
Added tele, speedup, front and switch layer to the client Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-30 21:31:19 +00:00
pEditor->m_Brush.Clear();
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
return CUI::POPUP_CLOSE_CURRENT;
Added tele, speedup, front and switch layer to the client Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-30 21:31:19 +00:00
}
}
Fix whitespaces a bit
2015-07-09 00:08:14 +00:00
added creating button for tunelayer and a popup menu for TuneZone Numbers
2014-03-12 23:01:15 +00:00
if(pEditor->GetSelectedGroup()->m_GameGroup && !pEditor->m_Map.m_pTuneLayer)
Run clang-format Purely automatic change. In case of conflict with this change, apply the other change and rerun the formatting to restore it: $ python scripts/fix_style.py
2020-09-26 19:41:58 +00:00
{
// new tune layer
Refactor `CEditor::PopupGroup`
2023-04-01 21:18:27 +00:00
View.HSplitBottom(5.0f, &View, nullptr);
Run clang-format Purely automatic change. In case of conflict with this change, apply the other change and rerun the formatting to restore it: $ python scripts/fix_style.py
2020-09-26 19:41:58 +00:00
View.HSplitBottom(12.0f, &View, &Button);
static int s_NewTuneLayerButton = 0;
if(pEditor->DoButton_Editor(&s_NewTuneLayerButton, "Add tune layer", 0, &Button, 0, "Creates a new tuning layer"))
added creating button for tunelayer and a popup menu for TuneZone Numbers
2014-03-12 23:01:15 +00:00
{
Huge variable naming format Fix pointer and pointer array variable naming Huge renaming to match our rules Used regex: (?!(return|delete)\b)\b\w+ (m_|ms_|g_|gs_|s_)[^a]\w+\[ (?!(return|delete)\b)\b\w+ (?!(m_|ms_|g_|gs_|s_))[^a]\w+\[ Further format static variables Format almost all pointer names accordingly Used regex: (?!(return)\b)\b\w+ \*(?!(m_p|p|s_p|m_ap|s_ap|g_p|g_ap|ap|gs_ap|ms_ap|gs_p|ms_p))\w+\b[^:\(p] clang-format Fix CI fail Fix misnamed non pointer as pointer and non array as array Used regex: (?!(return|delete)\b)\b\w+ (m_|ms_|g_|gs_|s_)p\w+\b (?!return\b)\b\w+ (ms_|m_|g_|gs_|s_)a\w+\b[^\[] clang-format Revert to SCREAMING_SNAKE_CASE and reinstate dead code
2022-06-30 22:36:32 +00:00
CLayer *pTuneLayer = new CLayerTune(pEditor->m_Map.m_pGameLayer->m_Width, pEditor->m_Map.m_pGameLayer->m_Height);
pEditor->m_Map.MakeTuneLayer(pTuneLayer);
pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->AddLayer(pTuneLayer);
Format vector variables names (fixes #5209)
2022-06-11 19:38:18 +00:00
pEditor->SelectLayer(pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->m_vpLayers.size() - 1);
Run clang-format Purely automatic change. In case of conflict with this change, apply the other change and rerun the formatting to restore it: $ python scripts/fix_style.py
2020-09-26 19:41:58 +00:00
pEditor->m_Brush.Clear();
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
return CUI::POPUP_CLOSE_CURRENT;
added creating button for tunelayer and a popup menu for TuneZone Numbers
2014-03-12 23:01:15 +00:00
}
Run clang-format Purely automatic change. In case of conflict with this change, apply the other change and rerun the formatting to restore it: $ python scripts/fix_style.py
2020-09-26 19:41:58 +00:00
}
Merged Oy, Cleaned up, removed some useless features and code parts Added Icon by landil alot more...
2011-04-09 06:41:31 +00:00
Added tele, speedup, front and switch layer to the client Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-30 21:31:19 +00:00
if(pEditor->GetSelectedGroup()->m_GameGroup && !pEditor->m_Map.m_pFrontLayer)
{
Fix a few names in popups
2019-11-22 11:28:34 +00:00
// new front layer
Refactor `CEditor::PopupGroup`
2023-04-01 21:18:27 +00:00
View.HSplitBottom(5.0f, &View, nullptr);
Added tele, speedup, front and switch layer to the client Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-30 21:31:19 +00:00
View.HSplitBottom(12.0f, &View, &Button);
static int s_NewFrontLayerButton = 0;
Fix some editor popup
2014-12-01 19:35:30 +00:00
if(pEditor->DoButton_Editor(&s_NewFrontLayerButton, "Add front layer", 0, &Button, 0, "Creates a new item layer"))
Added tele, speedup, front and switch layer to the client Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-30 21:31:19 +00:00
{
Huge variable naming format Fix pointer and pointer array variable naming Huge renaming to match our rules Used regex: (?!(return|delete)\b)\b\w+ (m_|ms_|g_|gs_|s_)[^a]\w+\[ (?!(return|delete)\b)\b\w+ (?!(m_|ms_|g_|gs_|s_))[^a]\w+\[ Further format static variables Format almost all pointer names accordingly Used regex: (?!(return)\b)\b\w+ \*(?!(m_p|p|s_p|m_ap|s_ap|g_p|g_ap|ap|gs_ap|ms_ap|gs_p|ms_p))\w+\b[^:\(p] clang-format Fix CI fail Fix misnamed non pointer as pointer and non array as array Used regex: (?!(return|delete)\b)\b\w+ (m_|ms_|g_|gs_|s_)p\w+\b (?!return\b)\b\w+ (ms_|m_|g_|gs_|s_)a\w+\b[^\[] clang-format Revert to SCREAMING_SNAKE_CASE and reinstate dead code
2022-06-30 22:36:32 +00:00
CLayer *pFrontLayer = new CLayerFront(pEditor->m_Map.m_pGameLayer->m_Width, pEditor->m_Map.m_pGameLayer->m_Height);
pEditor->m_Map.MakeFrontLayer(pFrontLayer);
pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->AddLayer(pFrontLayer);
Format vector variables names (fixes #5209)
2022-06-11 19:38:18 +00:00
pEditor->SelectLayer(pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->m_vpLayers.size() - 1);
Added tele, speedup, front and switch layer to the client Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-30 21:31:19 +00:00
pEditor->m_Brush.Clear();
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
return CUI::POPUP_CLOSE_CURRENT;
Added tele, speedup, front and switch layer to the client Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-30 21:31:19 +00:00
}
}
if(pEditor->GetSelectedGroup()->m_GameGroup && !pEditor->m_Map.m_pSwitchLayer)
{
// new Switch layer
Refactor `CEditor::PopupGroup`
2023-04-01 21:18:27 +00:00
View.HSplitBottom(5.0f, &View, nullptr);
Added tele, speedup, front and switch layer to the client Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-30 21:31:19 +00:00
View.HSplitBottom(12.0f, &View, &Button);
static int s_NewSwitchLayerButton = 0;
Fix some editor popup
2014-12-01 19:35:30 +00:00
if(pEditor->DoButton_Editor(&s_NewSwitchLayerButton, "Add switch layer", 0, &Button, 0, "Creates a new switch layer"))
Added tele, speedup, front and switch layer to the client Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-30 21:31:19 +00:00
{
Huge variable naming format Fix pointer and pointer array variable naming Huge renaming to match our rules Used regex: (?!(return|delete)\b)\b\w+ (m_|ms_|g_|gs_|s_)[^a]\w+\[ (?!(return|delete)\b)\b\w+ (?!(m_|ms_|g_|gs_|s_))[^a]\w+\[ Further format static variables Format almost all pointer names accordingly Used regex: (?!(return)\b)\b\w+ \*(?!(m_p|p|s_p|m_ap|s_ap|g_p|g_ap|ap|gs_ap|ms_ap|gs_p|ms_p))\w+\b[^:\(p] clang-format Fix CI fail Fix misnamed non pointer as pointer and non array as array Used regex: (?!(return|delete)\b)\b\w+ (m_|ms_|g_|gs_|s_)p\w+\b (?!return\b)\b\w+ (ms_|m_|g_|gs_|s_)a\w+\b[^\[] clang-format Revert to SCREAMING_SNAKE_CASE and reinstate dead code
2022-06-30 22:36:32 +00:00
CLayer *pSwitchLayer = new CLayerSwitch(pEditor->m_Map.m_pGameLayer->m_Width, pEditor->m_Map.m_pGameLayer->m_Height);
pEditor->m_Map.MakeSwitchLayer(pSwitchLayer);
pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->AddLayer(pSwitchLayer);
Format vector variables names (fixes #5209)
2022-06-11 19:38:18 +00:00
pEditor->SelectLayer(pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->m_vpLayers.size() - 1);
Added tele, speedup, front and switch layer to the client Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-30 21:31:19 +00:00
pEditor->m_Brush.Clear();
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
return CUI::POPUP_CLOSE_CURRENT;
Added tele, speedup, front and switch layer to the client Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-30 21:31:19 +00:00
}
}
Add support for sound layers
2014-10-08 15:33:06 +00:00
// new quad layer
Refactor `CEditor::PopupGroup`
2023-04-01 21:18:27 +00:00
View.HSplitBottom(5.0f, &View, nullptr);
copied refactor to trunk
2010-05-29 07:25:38 +00:00
View.HSplitBottom(12.0f, &View, &Button);
static int s_NewQuadLayerButton = 0;
removed localisation in the editor
2011-03-20 16:04:03 +00:00
if(pEditor->DoButton_Editor(&s_NewQuadLayerButton, "Add quads layer", 0, &Button, 0, "Creates a new quad layer"))
editor update and other stuff
2008-01-17 23:09:49 +00:00
{
Huge variable naming format Fix pointer and pointer array variable naming Huge renaming to match our rules Used regex: (?!(return|delete)\b)\b\w+ (m_|ms_|g_|gs_|s_)[^a]\w+\[ (?!(return|delete)\b)\b\w+ (?!(m_|ms_|g_|gs_|s_))[^a]\w+\[ Further format static variables Format almost all pointer names accordingly Used regex: (?!(return)\b)\b\w+ \*(?!(m_p|p|s_p|m_ap|s_ap|g_p|g_ap|ap|gs_ap|ms_ap|gs_p|ms_p))\w+\b[^:\(p] clang-format Fix CI fail Fix misnamed non pointer as pointer and non array as array Used regex: (?!(return|delete)\b)\b\w+ (m_|ms_|g_|gs_|s_)p\w+\b (?!return\b)\b\w+ (ms_|m_|g_|gs_|s_)a\w+\b[^\[] clang-format Revert to SCREAMING_SNAKE_CASE and reinstate dead code
2022-06-30 22:36:32 +00:00
CLayer *pQuadLayer = new CLayerQuads;
pQuadLayer->m_pEditor = pEditor;
pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->AddLayer(pQuadLayer);
Format vector variables names (fixes #5209)
2022-06-11 19:38:18 +00:00
pEditor->SelectLayer(pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->m_vpLayers.size() - 1);
pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->m_Collapse = false;
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
return CUI::POPUP_CLOSE_CURRENT;
editor update and other stuff
2008-01-17 23:09:49 +00:00
}
Add support for sound layers
2014-10-08 15:33:06 +00:00
// new tile layer
Refactor `CEditor::PopupGroup`
2023-04-01 21:18:27 +00:00
View.HSplitBottom(5.0f, &View, nullptr);
copied refactor to trunk
2010-05-29 07:25:38 +00:00
View.HSplitBottom(12.0f, &View, &Button);
static int s_NewTileLayerButton = 0;
removed localisation in the editor
2011-03-20 16:04:03 +00:00
if(pEditor->DoButton_Editor(&s_NewTileLayerButton, "Add tile layer", 0, &Button, 0, "Creates a new tile layer"))
editor update and other stuff
2008-01-17 23:09:49 +00:00
{
Huge variable naming format Fix pointer and pointer array variable naming Huge renaming to match our rules Used regex: (?!(return|delete)\b)\b\w+ (m_|ms_|g_|gs_|s_)[^a]\w+\[ (?!(return|delete)\b)\b\w+ (?!(m_|ms_|g_|gs_|s_))[^a]\w+\[ Further format static variables Format almost all pointer names accordingly Used regex: (?!(return)\b)\b\w+ \*(?!(m_p|p|s_p|m_ap|s_ap|g_p|g_ap|ap|gs_ap|ms_ap|gs_p|ms_p))\w+\b[^:\(p] clang-format Fix CI fail Fix misnamed non pointer as pointer and non array as array Used regex: (?!(return|delete)\b)\b\w+ (m_|ms_|g_|gs_|s_)p\w+\b (?!return\b)\b\w+ (ms_|m_|g_|gs_|s_)a\w+\b[^\[] clang-format Revert to SCREAMING_SNAKE_CASE and reinstate dead code
2022-06-30 22:36:32 +00:00
CLayer *pTileLayer = new CLayerTiles(pEditor->m_Map.m_pGameLayer->m_Width, pEditor->m_Map.m_pGameLayer->m_Height);
pTileLayer->m_pEditor = pEditor;
pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->AddLayer(pTileLayer);
Format vector variables names (fixes #5209)
2022-06-11 19:38:18 +00:00
pEditor->SelectLayer(pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->m_vpLayers.size() - 1);
pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->m_Collapse = false;
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
return CUI::POPUP_CLOSE_CURRENT;
editor update and other stuff
2008-01-17 23:09:49 +00:00
}
added "Whitespace and line Endings cleanup" by GreYFoX
2011-04-13 18:37:12 +00:00
Add support for sound layers
2014-10-08 15:33:06 +00:00
// new sound layer
Refactor `CEditor::PopupGroup`
2023-04-01 21:18:27 +00:00
View.HSplitBottom(5.0f, &View, nullptr);
Add support for sound layers
2014-10-08 15:33:06 +00:00
View.HSplitBottom(12.0f, &View, &Button);
static int s_NewSoundLayerButton = 0;
if(pEditor->DoButton_Editor(&s_NewSoundLayerButton, "Add sound layer", 0, &Button, 0, "Creates a new sound layer"))
{
Huge variable naming format Fix pointer and pointer array variable naming Huge renaming to match our rules Used regex: (?!(return|delete)\b)\b\w+ (m_|ms_|g_|gs_|s_)[^a]\w+\[ (?!(return|delete)\b)\b\w+ (?!(m_|ms_|g_|gs_|s_))[^a]\w+\[ Further format static variables Format almost all pointer names accordingly Used regex: (?!(return)\b)\b\w+ \*(?!(m_p|p|s_p|m_ap|s_ap|g_p|g_ap|ap|gs_ap|ms_ap|gs_p|ms_p))\w+\b[^:\(p] clang-format Fix CI fail Fix misnamed non pointer as pointer and non array as array Used regex: (?!(return|delete)\b)\b\w+ (m_|ms_|g_|gs_|s_)p\w+\b (?!return\b)\b\w+ (ms_|m_|g_|gs_|s_)a\w+\b[^\[] clang-format Revert to SCREAMING_SNAKE_CASE and reinstate dead code
2022-06-30 22:36:32 +00:00
CLayer *pSoundLayer = new CLayerSounds;
pSoundLayer->m_pEditor = pEditor;
pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->AddLayer(pSoundLayer);
Format vector variables names (fixes #5209)
2022-06-11 19:38:18 +00:00
pEditor->SelectLayer(pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->m_vpLayers.size() - 1);
pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->m_Collapse = false;
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
return CUI::POPUP_CLOSE_CURRENT;
Add support for sound layers
2014-10-08 15:33:06 +00:00
}
ability to name groups and layers
2011-07-12 01:14:46 +00:00
// group name
if(!pEditor->GetSelectedGroup()->m_GameGroup)
{
Refactor `CEditor::PopupGroup`
2023-04-01 21:18:27 +00:00
View.HSplitBottom(5.0f, &View, nullptr);
ability to name groups and layers
2011-07-12 01:14:46 +00:00
View.HSplitBottom(12.0f, &View, &Button);
Refactor vertical alignment in UI Add separate constants `TEXTALIGN_TOP`, `TEXTALIGN_MIDDLE` and `TEXTALIGN_BOTTOM` for vertical alignment. Add shorthand constants for all possible combinations of horizontal and vertical alignment, e.g. `TEXTALIGN_MC` for `TEXTALIGN_MIDDLE | TEXTALIGN_CENTER`. Replace usage of `SLabelProperties::m_AlignVertically` with these constants in all menu and editor code for more convenient and versatile alignment of text. Use combined horizontal-vertical alignment constants for all existing labels. Manually adjust layout for some elements which were initially misaligned with the new implementation. Refactoring: - Use `CORNER_NONE` instead of `0`. - Improve some `CUIRect` variables names and usage.
2023-04-09 19:24:06 +00:00
pEditor->UI()->DoLabel(&Button, "Name:", 10.0f, TEXTALIGN_ML);
Use nullptr in generated and editor -Wzero-as-null-pointer-constant
2022-06-13 16:28:13 +00:00
Button.VSplitLeft(40.0f, nullptr, &Button);
Port line input and IME support from 0.7 Port the line input (UI edit boxes, chat, console) and Input Method Editor (IME) support from upstream. Closes #4397. General ------------------------------ Fix issues with the text input. Closes #4346. Closes #4524. Word skipping (when holding Ctrl) is overhauled to be consistent with the Windows / Firefox experience that I took as reference. Improve usability by not blinking (i.e. always rendering) the caret shortly after is has been moved. UI text input ------------------------------ Fix inconsistent mouse-based left and right scrolling (closes #4347). Support smooth left and right scrolling. Chat ------------------------------ Support keyboard-based text selection of the chat input. Mouse-based selection could be support in the future when we decide to add something like an ingame UI cursor. Support smooth up and down scrolling of the chat input, removing the old hack that offsets the input string to simulate scrolling. Console ------------------------------ Also support mouse-based text selection of the command input. Only text from either the command input or the console log can be selected at the same time. This ensures that Ctrl+C will always copy the text that is currently visually selected in the console. Check for Ctrl+C input event in event handler instead of in render function, to hopefully fix the issue that copying does not work sometimes (closes #5974 until further notice). When Ctrl+C is used to copy text from the console log, the selection is cleared. This should make it more clear when text was copied from the log. Fix an issue that was preventing the console log selection from being cleared, when all log lines are selected. Remove Ctrl+A/E hotkeys that move cursor to beginning/end respectively. Ctrl+A now selectes all text like for all other inputs. Home and End keys can still be used to go the beginning and end. Remove Ctrl+U/K hotkeys that clear everything before/after the cursor respectively. Hold shift and use Home/End to select everything instead. IME support ------------------------------ Render list of IME candidates in the client on Windows, so the candidate list can also be viewed in fullscreen mode. There is no API available to retrieve a candidate list on the other operating systems. Improve composition rendering by underlining the composition text instead of putting it in square brackets. Track active input globally to properly activate and deactivate IME through the SDL functions. Closes #1030. Closes #1008. Password rendering ------------------------------ Fix rendering of passwords containing unicode. Instead of rendering one star character for each UTF-8 `char`, render on star for every unicode codepoint. Show the composition text also for passwords. Without seeing the composition text it's hard to type a password containing those characters. The candidate window exposes the composition anyway. If you don't want to expose your password this way, e.g. while streaming, you could: 1. Use a latin password and switch off the IME for the password input with the IME hotkey. 2. Blank your screen with an external program while you are streaming and entering passwords. 3. Use binds to authenticate in rcon or to set the server browser password. Refactoring ------------------------------ Move all text input logic and general rendering to `CLineInput`. A `CLineInput` is associated with a particular `char` buffer given as a pointer either in the constructor or with `SetBuffer`. The maximum byte size of the buffer must also be specified. The maximum length in unicode codepoints can also be specified separately (e.g. on upstream, name are limited by the number of unicode codepoints instead). Add `CLineInputBuffered`, which is a `CLineInput` that own a `char` buffer of a fixed size, which is specified as a template argument. As `CLineInput` does not own a buffer anymore, this reduces duplicate code for line inputs that need their own buffer. Add `CLineInputNumber` which has additional convenience functions to consider the text as an `int` or `float`, to reduce duplicate code in those cases. In the future we could also add an input filter function so that only numbers can be entered in the number input. Add `CLineInput::SetClipboardLineCallback` to handle the case that multiple lines of text are pasted into a lineinput. This reduces duplicate code, as this behavior was previously implemented separately for chat and console. The behavior is also fixed to be consistent with the console on Windows, so the first line being pasted edits the current input text and then sends it instead of being sent on its own without the existing input text. Add `CalcFontSizeAndBoundingBox` to UI to reduce duplicate code. Expose `CalcAlignedCursorPos` as static member function to reuse it for line input. Dispatch input events to UI inputs through the event handler instead of storing them in a duplicate buffer. Use `size_t` for line input cursor position, length etc. and for `str_utf8_stats`. Add `IButtonColorFunction` to UI to describe a functions that defines colors for the Default, Active and Hovered states of UI elements. Add some default button color functions. Use button color function to reduce duplicate code in scrollbar rendering. Use `vec2` instead of two `floats` to represent the mouse positions in the text renderer. Remove `CaretPosition` again, as it does not calculate the correct Y position near line breaks due to the wrapping being different when not rendering the entire string. Instead, calculate the exact caret position when rending a text container and store the caret position in the text cursor for later use. IME usage guide (Windows) ------------------------------ 1. Install the respective language and the Microsoft-IME keyboard (e.g. for Chinese, Japanese or Korean). 2. Launch the game (or a text editor to first try out the IME). Note that Windows may track the input language separately for every application. You can change this in the Windows input settings so the input language is changed globally. 2. Switch the input language using the hotkey Windows+Space or another hotkey that you configured in the Windows input settings (Alt+Shift is the default, but you should consider disabling it, to avoid accidentally changing the input language while playing). 3. Switch from Latin/English input mode to the respective asian input mode. - Chinese: Use Ctrl+Space to switch between English and Chinese input mode. You can change this hotkey in the IME's settings. - Japanese: Use Ctrl+Space to switch between Alphanumeric and Hiragana/Katakana input mode. You can change this hotkey in the IME's settings. - Korean: Use Right Alt to switch between English and Hangul input mode. You cannot change this hotkey as of yet. - Note that the input mode is also tracked per application, but there is no setting to change this behavior as far as I know, so you'll need to switch for every application separately. 4. Start typing. The underlined text is the current composition text. While a composition is active, you can only edit the composition text. Confirm the composition with Space or by selecting a candidate from the candidate list with the arrow keys. Cancel the composition with Escape or by using Backspace to delete the composition text. Note that not all languages offer a candidate list. SDL version-specific issues ------------------------------ - 2.26.5, 2.24.2, 2.0.22: IME candidates work. But there are minor bugs when moving the composition cursor. - 2.0.18, 2.0.20: IME candidates work. - 2.0.16 (our current version): IME candidates cannot be determined with Windows API. Windows tries to draw the composition window like before, so this does not work in fullscreen mode. - 2.0.8 (upstream 0.7): IME candidates work. But this SDL version is too old for us.
2023-01-03 21:28:38 +00:00
static CLineInput s_NameInput;
s_NameInput.SetBuffer(pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->m_aName, sizeof(pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->m_aName));
if(pEditor->DoEditBox(&s_NameInput, &Button, 10.0f))
fixed few things in th editor
2011-07-20 20:18:31 +00:00
pEditor->m_Map.m_Modified = true;
ability to name groups and layers
2011-07-12 01:14:46 +00:00
}
editor update and other stuff
2008-01-17 23:09:49 +00:00
enum
{
Run clang-format Purely automatic change. In case of conflict with this change, apply the other change and rerun the formatting to restore it: $ python scripts/fix_style.py
2020-09-26 19:41:58 +00:00
PROP_ORDER = 0,
editor update and other stuff
2008-01-17 23:09:49 +00:00
PROP_POS_X,
PROP_POS_Y,
PROP_PARA_X,
PROP_PARA_Y,
Parallax Zoom: Add default zoom option to the editor Safe defaults for map editing: unless opted-in, Parallax Zoom will default to maximum(parallax{x,y}).
2022-08-06 00:31:42 +00:00
PROP_CUSTOM_ZOOM,
Parallax-aware zoom How this works: parallax values configure perceived distance from camera when it's moving along x and y axes. Assume that zoom is moving the camera away and scale layers accordingly, with background layers (furtherst away) changing the least. New per-ItemGroup (LayerGroup) setting allows to set the new parallax value independently from the other two. This can be used to do tricks like on Time Shop zoom correctly or make it feel like the camera is changing the field of view at the same time as moving in space.
2022-08-04 23:16:44 +00:00
PROP_PARA_ZOOM,
fixed loads of graphical optimizations
2008-03-29 11:44:03 +00:00
PROP_USE_CLIPPING,
PROP_CLIP_X,
PROP_CLIP_Y,
PROP_CLIP_W,
PROP_CLIP_H,
editor update and other stuff
2008-01-17 23:09:49 +00:00
NUM_PROPS,
};
added "Whitespace and line Endings cleanup" by GreYFoX
2011-04-13 18:37:12 +00:00
copied refactor to trunk
2010-05-29 07:25:38 +00:00
CProperty aProps[] = {
Format vector variables names (fixes #5209)
2022-06-11 19:38:18 +00:00
{"Order", pEditor->m_SelectedGroup, PROPTYPE_INT_STEP, 0, (int)pEditor->m_Map.m_vpGroups.size() - 1},
{"Pos X", -pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->m_OffsetX, PROPTYPE_INT_SCROLL, -1000000, 1000000},
{"Pos Y", -pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->m_OffsetY, PROPTYPE_INT_SCROLL, -1000000, 1000000},
{"Para X", pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->m_ParallaxX, PROPTYPE_INT_SCROLL, -1000000, 1000000},
{"Para Y", pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->m_ParallaxY, PROPTYPE_INT_SCROLL, -1000000, 1000000},
Parallax Zoom: Add default zoom option to the editor Safe defaults for map editing: unless opted-in, Parallax Zoom will default to maximum(parallax{x,y}).
2022-08-06 00:31:42 +00:00
{"Custom Zoom", pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->m_CustomParallaxZoom, PROPTYPE_BOOL, 0, 1},
Parallax-aware zoom How this works: parallax values configure perceived distance from camera when it's moving along x and y axes. Assume that zoom is moving the camera away and scale layers accordingly, with background layers (furtherst away) changing the least. New per-ItemGroup (LayerGroup) setting allows to set the new parallax value independently from the other two. This can be used to do tricks like on Time Shop zoom correctly or make it feel like the camera is changing the field of view at the same time as moving in space.
2022-08-04 23:16:44 +00:00
{"Para Zoom", pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->m_ParallaxZoom, PROPTYPE_INT_SCROLL, -1000000, 1000000},
Format vector variables names (fixes #5209)
2022-06-11 19:38:18 +00:00
{"Use Clipping", pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->m_UseClipping, PROPTYPE_BOOL, 0, 1},
{"Clip X", pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->m_ClipX, PROPTYPE_INT_SCROLL, -1000000, 1000000},
{"Clip Y", pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->m_ClipY, PROPTYPE_INT_SCROLL, -1000000, 1000000},
{"Clip W", pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->m_ClipW, PROPTYPE_INT_SCROLL, 0, 1000000},
{"Clip H", pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->m_ClipH, PROPTYPE_INT_SCROLL, 0, 1000000},
Use nullptr in generated and editor -Wzero-as-null-pointer-constant
2022-06-13 16:28:13 +00:00
{nullptr},
editor update and other stuff
2008-01-17 23:09:49 +00:00
};
added "Whitespace and line Endings cleanup" by GreYFoX
2011-04-13 18:37:12 +00:00
Refactor `CEditor::PopupGroup`
2023-04-01 21:18:27 +00:00
// cut the properties that aren't needed
copied refactor to trunk
2010-05-29 07:25:38 +00:00
if(pEditor->GetSelectedGroup()->m_GameGroup)
Use nullptr in generated and editor -Wzero-as-null-pointer-constant
2022-06-13 16:28:13 +00:00
aProps[PROP_POS_X].m_pName = nullptr;
added "Whitespace and line Endings cleanup" by GreYFoX
2011-04-13 18:37:12 +00:00
Refactor `CEditor::PopupGroup`
2023-04-01 21:18:27 +00:00
static int s_aIds[NUM_PROPS] = {0};
int NewVal = 0;
copied refactor to trunk
2010-05-29 07:25:38 +00:00
int Prop = pEditor->DoProperties(&View, aProps, s_aIds, &NewVal);
added notification for unsaved map data and a confirmation for overwriting an existing map in the editor. Closes #115
2011-03-21 23:31:42 +00:00
if(Prop != -1)
Refactor `CEditor::PopupGroup`
2023-04-01 21:18:27 +00:00
{
added notification for unsaved map data and a confirmation for overwriting an existing map in the editor. Closes #115
2011-03-21 23:31:42 +00:00
pEditor->m_Map.m_Modified = true;
Refactor `CEditor::PopupGroup`
2023-04-01 21:18:27 +00:00
}
added notification for unsaved map data and a confirmation for overwriting an existing map in the editor. Closes #115
2011-03-21 23:31:42 +00:00
copied refactor to trunk
2010-05-29 07:25:38 +00:00
if(Prop == PROP_ORDER)
Refactor `CEditor::PopupGroup`
2023-04-01 21:18:27 +00:00
{
copied refactor to trunk
2010-05-29 07:25:38 +00:00
pEditor->m_SelectedGroup = pEditor->m_Map.SwapGroups(pEditor->m_SelectedGroup, NewVal);
Refactor `CEditor::PopupGroup`
2023-04-01 21:18:27 +00:00
}
added "Whitespace and line Endings cleanup" by GreYFoX
2011-04-13 18:37:12 +00:00
editor update and other stuff
2008-01-17 23:09:49 +00:00
// these can not be changed on the game group
copied refactor to trunk
2010-05-29 07:25:38 +00:00
if(!pEditor->GetSelectedGroup()->m_GameGroup)
editor update and other stuff
2008-01-17 23:09:49 +00:00
{
Run clang-format Purely automatic change. In case of conflict with this change, apply the other change and rerun the formatting to restore it: $ python scripts/fix_style.py
2020-09-26 19:41:58 +00:00
if(Prop == PROP_PARA_X)
Refactor `CEditor::PopupGroup`
2023-04-01 21:18:27 +00:00
{
Format vector variables names (fixes #5209)
2022-06-11 19:38:18 +00:00
pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->m_ParallaxX = NewVal;
Refactor `CEditor::PopupGroup`
2023-04-01 21:18:27 +00:00
}
Run clang-format Purely automatic change. In case of conflict with this change, apply the other change and rerun the formatting to restore it: $ python scripts/fix_style.py
2020-09-26 19:41:58 +00:00
else if(Prop == PROP_PARA_Y)
Refactor `CEditor::PopupGroup`
2023-04-01 21:18:27 +00:00
{
Format vector variables names (fixes #5209)
2022-06-11 19:38:18 +00:00
pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->m_ParallaxY = NewVal;
Refactor `CEditor::PopupGroup`
2023-04-01 21:18:27 +00:00
}
Parallax Zoom: Add default zoom option to the editor Safe defaults for map editing: unless opted-in, Parallax Zoom will default to maximum(parallax{x,y}).
2022-08-06 00:31:42 +00:00
else if(Prop == PROP_CUSTOM_ZOOM)
Refactor `CEditor::PopupGroup`
2023-04-01 21:18:27 +00:00
{
Parallax Zoom: Add default zoom option to the editor Safe defaults for map editing: unless opted-in, Parallax Zoom will default to maximum(parallax{x,y}).
2022-08-06 00:31:42 +00:00
pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->m_CustomParallaxZoom = NewVal;
Refactor `CEditor::PopupGroup`
2023-04-01 21:18:27 +00:00
}
Parallax-aware zoom How this works: parallax values configure perceived distance from camera when it's moving along x and y axes. Assume that zoom is moving the camera away and scale layers accordingly, with background layers (furtherst away) changing the least. New per-ItemGroup (LayerGroup) setting allows to set the new parallax value independently from the other two. This can be used to do tricks like on Time Shop zoom correctly or make it feel like the camera is changing the field of view at the same time as moving in space.
2022-08-04 23:16:44 +00:00
else if(Prop == PROP_PARA_ZOOM)
Parallax Zoom: Add default zoom option to the editor Safe defaults for map editing: unless opted-in, Parallax Zoom will default to maximum(parallax{x,y}).
2022-08-06 00:31:42 +00:00
{
pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->m_CustomParallaxZoom = 1;
Parallax-aware zoom How this works: parallax values configure perceived distance from camera when it's moving along x and y axes. Assume that zoom is moving the camera away and scale layers accordingly, with background layers (furtherst away) changing the least. New per-ItemGroup (LayerGroup) setting allows to set the new parallax value independently from the other two. This can be used to do tricks like on Time Shop zoom correctly or make it feel like the camera is changing the field of view at the same time as moving in space.
2022-08-04 23:16:44 +00:00
pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->m_ParallaxZoom = NewVal;
Parallax Zoom: Add default zoom option to the editor Safe defaults for map editing: unless opted-in, Parallax Zoom will default to maximum(parallax{x,y}).
2022-08-06 00:31:42 +00:00
}
Run clang-format Purely automatic change. In case of conflict with this change, apply the other change and rerun the formatting to restore it: $ python scripts/fix_style.py
2020-09-26 19:41:58 +00:00
else if(Prop == PROP_POS_X)
Refactor `CEditor::PopupGroup`
2023-04-01 21:18:27 +00:00
{
Format vector variables names (fixes #5209)
2022-06-11 19:38:18 +00:00
pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->m_OffsetX = -NewVal;
Refactor `CEditor::PopupGroup`
2023-04-01 21:18:27 +00:00
}
Run clang-format Purely automatic change. In case of conflict with this change, apply the other change and rerun the formatting to restore it: $ python scripts/fix_style.py
2020-09-26 19:41:58 +00:00
else if(Prop == PROP_POS_Y)
Refactor `CEditor::PopupGroup`
2023-04-01 21:18:27 +00:00
{
Format vector variables names (fixes #5209)
2022-06-11 19:38:18 +00:00
pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->m_OffsetY = -NewVal;
Refactor `CEditor::PopupGroup`
2023-04-01 21:18:27 +00:00
}
Run clang-format Purely automatic change. In case of conflict with this change, apply the other change and rerun the formatting to restore it: $ python scripts/fix_style.py
2020-09-26 19:41:58 +00:00
else if(Prop == PROP_USE_CLIPPING)
Refactor `CEditor::PopupGroup`
2023-04-01 21:18:27 +00:00
{
Format vector variables names (fixes #5209)
2022-06-11 19:38:18 +00:00
pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->m_UseClipping = NewVal;
Refactor `CEditor::PopupGroup`
2023-04-01 21:18:27 +00:00
}
Run clang-format Purely automatic change. In case of conflict with this change, apply the other change and rerun the formatting to restore it: $ python scripts/fix_style.py
2020-09-26 19:41:58 +00:00
else if(Prop == PROP_CLIP_X)
Refactor `CEditor::PopupGroup`
2023-04-01 21:18:27 +00:00
{
Format vector variables names (fixes #5209)
2022-06-11 19:38:18 +00:00
pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->m_ClipX = NewVal;
Refactor `CEditor::PopupGroup`
2023-04-01 21:18:27 +00:00
}
Run clang-format Purely automatic change. In case of conflict with this change, apply the other change and rerun the formatting to restore it: $ python scripts/fix_style.py
2020-09-26 19:41:58 +00:00
else if(Prop == PROP_CLIP_Y)
Refactor `CEditor::PopupGroup`
2023-04-01 21:18:27 +00:00
{
Format vector variables names (fixes #5209)
2022-06-11 19:38:18 +00:00
pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->m_ClipY = NewVal;
Refactor `CEditor::PopupGroup`
2023-04-01 21:18:27 +00:00
}
Run clang-format Purely automatic change. In case of conflict with this change, apply the other change and rerun the formatting to restore it: $ python scripts/fix_style.py
2020-09-26 19:41:58 +00:00
else if(Prop == PROP_CLIP_W)
Refactor `CEditor::PopupGroup`
2023-04-01 21:18:27 +00:00
{
Format vector variables names (fixes #5209)
2022-06-11 19:38:18 +00:00
pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->m_ClipW = NewVal;
Refactor `CEditor::PopupGroup`
2023-04-01 21:18:27 +00:00
}
Run clang-format Purely automatic change. In case of conflict with this change, apply the other change and rerun the formatting to restore it: $ python scripts/fix_style.py
2020-09-26 19:41:58 +00:00
else if(Prop == PROP_CLIP_H)
Refactor `CEditor::PopupGroup`
2023-04-01 21:18:27 +00:00
{
Format vector variables names (fixes #5209)
2022-06-11 19:38:18 +00:00
pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->m_ClipH = NewVal;
Refactor `CEditor::PopupGroup`
2023-04-01 21:18:27 +00:00
}
Parallax Zoom: Add default zoom option to the editor Safe defaults for map editing: unless opted-in, Parallax Zoom will default to maximum(parallax{x,y}).
2022-08-06 00:31:42 +00:00
pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->OnEdited();
editor update and other stuff
2008-01-17 23:09:49 +00:00
}
added "Whitespace and line Endings cleanup" by GreYFoX
2011-04-13 18:37:12 +00:00
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
return CUI::POPUP_KEEP_OPEN;
editor update and other stuff
2008-01-17 23:09:49 +00:00
}
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
CUI::EPopupMenuFunctionResult CEditor::PopupLayer(void *pContext, CUIRect View, bool Active)
editor update and other stuff
2008-01-17 23:09:49 +00:00
{
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
SLayerPopupContext *pPopup = (SLayerPopupContext *)pContext;
CEditor *pEditor = pPopup->m_pEditor;
Stateful editing
2020-02-28 15:25:27 +00:00
Refactor `CEditor:::PopupLayer`, remove `CEditor::IsSpecialLayer` - Use `pCurrentLayer` instead of `pEditor->GetSelectedLayer(0)` everywhere. - Remove unnecessary null-checks of `pCurrentLayer`. - Use `CLayer::IsEntitiesLayer` instead of `CEditor::IsSpecialLayer` and remove the latter function. - Restructure UI layout code and variables.
2023-01-22 10:58:09 +00:00
CLayerGroup *pCurrentGroup = pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup];
CLayer *pCurrentLayer = pEditor->GetSelectedLayer(0);
added "Whitespace and line Endings cleanup" by GreYFoX
2011-04-13 18:37:12 +00:00
Format vector variables names (fixes #5209)
2022-06-11 19:38:18 +00:00
if(pPopup->m_vpLayers.size() > 1)
Allow editing multiple tile layer props
2020-02-27 13:53:12 +00:00
{
Format vector variables names (fixes #5209)
2022-06-11 19:38:18 +00:00
return CLayerTiles::RenderCommonProperties(pPopup->m_CommonPropState, pEditor, &View, pPopup->m_vpLayers);
Allow editing multiple tile layer props
2020-02-27 13:53:12 +00:00
}
Refactor `CEditor:::PopupLayer`, remove `CEditor::IsSpecialLayer` - Use `pCurrentLayer` instead of `pEditor->GetSelectedLayer(0)` everywhere. - Remove unnecessary null-checks of `pCurrentLayer`. - Use `CLayer::IsEntitiesLayer` instead of `CEditor::IsSpecialLayer` and remove the latter function. - Restructure UI layout code and variables.
2023-01-22 10:58:09 +00:00
const bool EntitiesLayer = pCurrentLayer->IsEntitiesLayer();
Editor: added the possibility to duplicate layers
2022-08-17 23:07:16 +00:00
Refactor `CEditor:::PopupLayer`, remove `CEditor::IsSpecialLayer` - Use `pCurrentLayer` instead of `pEditor->GetSelectedLayer(0)` everywhere. - Remove unnecessary null-checks of `pCurrentLayer`. - Use `CLayer::IsEntitiesLayer` instead of `CEditor::IsSpecialLayer` and remove the latter function. - Restructure UI layout code and variables.
2023-01-22 10:58:09 +00:00
// delete button
if(pEditor->m_Map.m_pGameLayer != pCurrentLayer) // entities layers except the game layer can be deleted
Editor: added the possibility to duplicate layers
2022-08-17 23:07:16 +00:00
{
Refactor `CEditor:::PopupLayer`, remove `CEditor::IsSpecialLayer` - Use `pCurrentLayer` instead of `pEditor->GetSelectedLayer(0)` everywhere. - Remove unnecessary null-checks of `pCurrentLayer`. - Use `CLayer::IsEntitiesLayer` instead of `CEditor::IsSpecialLayer` and remove the latter function. - Restructure UI layout code and variables.
2023-01-22 10:58:09 +00:00
CUIRect DeleteButton;
View.HSplitBottom(12.0f, &View, &DeleteButton);
static int s_DeleteButton = 0;
if(pEditor->DoButton_Editor(&s_DeleteButton, "Delete layer", 0, &DeleteButton, 0, "Deletes the layer"))
Editor: added the possibility to duplicate layers
2022-08-17 23:07:16 +00:00
{
Refactor `CEditor:::PopupLayer`, remove `CEditor::IsSpecialLayer` - Use `pCurrentLayer` instead of `pEditor->GetSelectedLayer(0)` everywhere. - Remove unnecessary null-checks of `pCurrentLayer`. - Use `CLayer::IsEntitiesLayer` instead of `CEditor::IsSpecialLayer` and remove the latter function. - Restructure UI layout code and variables.
2023-01-22 10:58:09 +00:00
if(pCurrentLayer == pEditor->m_Map.m_pFrontLayer)
pEditor->m_Map.m_pFrontLayer = nullptr;
if(pCurrentLayer == pEditor->m_Map.m_pTeleLayer)
pEditor->m_Map.m_pTeleLayer = nullptr;
if(pCurrentLayer == pEditor->m_Map.m_pSpeedupLayer)
pEditor->m_Map.m_pSpeedupLayer = nullptr;
if(pCurrentLayer == pEditor->m_Map.m_pSwitchLayer)
pEditor->m_Map.m_pSwitchLayer = nullptr;
if(pCurrentLayer == pEditor->m_Map.m_pTuneLayer)
pEditor->m_Map.m_pTuneLayer = nullptr;
pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->DeleteLayer(pEditor->m_vSelectedLayers[0]);
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
return CUI::POPUP_CLOSE_CURRENT;
Editor: added the possibility to duplicate layers
2022-08-17 23:07:16 +00:00
}
}
Refactor `CEditor:::PopupLayer`, remove `CEditor::IsSpecialLayer` - Use `pCurrentLayer` instead of `pEditor->GetSelectedLayer(0)` everywhere. - Remove unnecessary null-checks of `pCurrentLayer`. - Use `CLayer::IsEntitiesLayer` instead of `CEditor::IsSpecialLayer` and remove the latter function. - Restructure UI layout code and variables.
2023-01-22 10:58:09 +00:00
// duplicate button
if(!EntitiesLayer) // entities layers cannot be duplicated
editor update and other stuff
2008-01-17 23:09:49 +00:00
{
Refactor `CEditor:::PopupLayer`, remove `CEditor::IsSpecialLayer` - Use `pCurrentLayer` instead of `pEditor->GetSelectedLayer(0)` everywhere. - Remove unnecessary null-checks of `pCurrentLayer`. - Use `CLayer::IsEntitiesLayer` instead of `CEditor::IsSpecialLayer` and remove the latter function. - Restructure UI layout code and variables.
2023-01-22 10:58:09 +00:00
CUIRect DuplicateButton;
View.HSplitBottom(4.0f, &View, nullptr);
View.HSplitBottom(12.0f, &View, &DuplicateButton);
static int s_DuplicationButton = 0;
if(pEditor->DoButton_Editor(&s_DuplicationButton, "Duplicate layer", 0, &DuplicateButton, 0, "Duplicates the layer"))
{
pEditor->m_Map.m_vpGroups[pEditor->m_SelectedGroup]->DuplicateLayer(pEditor->m_vSelectedLayers[0]);
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
return CUI::POPUP_CLOSE_CURRENT;
Refactor `CEditor:::PopupLayer`, remove `CEditor::IsSpecialLayer` - Use `pCurrentLayer` instead of `pEditor->GetSelectedLayer(0)` everywhere. - Remove unnecessary null-checks of `pCurrentLayer`. - Use `CLayer::IsEntitiesLayer` instead of `CEditor::IsSpecialLayer` and remove the latter function. - Restructure UI layout code and variables.
2023-01-22 10:58:09 +00:00
}
editor update and other stuff
2008-01-17 23:09:49 +00:00
}
ability to name groups and layers
2011-07-12 01:14:46 +00:00
// layer name
Refactor `CEditor:::PopupLayer`, remove `CEditor::IsSpecialLayer` - Use `pCurrentLayer` instead of `pEditor->GetSelectedLayer(0)` everywhere. - Remove unnecessary null-checks of `pCurrentLayer`. - Use `CLayer::IsEntitiesLayer` instead of `CEditor::IsSpecialLayer` and remove the latter function. - Restructure UI layout code and variables.
2023-01-22 10:58:09 +00:00
if(!EntitiesLayer) // name cannot be changed for entities layers
ability to name groups and layers
2011-07-12 01:14:46 +00:00
{
Refactor `CEditor:::PopupLayer`, remove `CEditor::IsSpecialLayer` - Use `pCurrentLayer` instead of `pEditor->GetSelectedLayer(0)` everywhere. - Remove unnecessary null-checks of `pCurrentLayer`. - Use `CLayer::IsEntitiesLayer` instead of `CEditor::IsSpecialLayer` and remove the latter function. - Restructure UI layout code and variables.
2023-01-22 10:58:09 +00:00
CUIRect Label, EditBox;
View.HSplitBottom(5.0f, &View, nullptr);
View.HSplitBottom(12.0f, &View, &Label);
Label.VSplitLeft(40.0f, &Label, &EditBox);
Refactor vertical alignment in UI Add separate constants `TEXTALIGN_TOP`, `TEXTALIGN_MIDDLE` and `TEXTALIGN_BOTTOM` for vertical alignment. Add shorthand constants for all possible combinations of horizontal and vertical alignment, e.g. `TEXTALIGN_MC` for `TEXTALIGN_MIDDLE | TEXTALIGN_CENTER`. Replace usage of `SLabelProperties::m_AlignVertically` with these constants in all menu and editor code for more convenient and versatile alignment of text. Use combined horizontal-vertical alignment constants for all existing labels. Manually adjust layout for some elements which were initially misaligned with the new implementation. Refactoring: - Use `CORNER_NONE` instead of `0`. - Improve some `CUIRect` variables names and usage.
2023-04-09 19:24:06 +00:00
pEditor->UI()->DoLabel(&Label, "Name:", 10.0f, TEXTALIGN_ML);
Port line input and IME support from 0.7 Port the line input (UI edit boxes, chat, console) and Input Method Editor (IME) support from upstream. Closes #4397. General ------------------------------ Fix issues with the text input. Closes #4346. Closes #4524. Word skipping (when holding Ctrl) is overhauled to be consistent with the Windows / Firefox experience that I took as reference. Improve usability by not blinking (i.e. always rendering) the caret shortly after is has been moved. UI text input ------------------------------ Fix inconsistent mouse-based left and right scrolling (closes #4347). Support smooth left and right scrolling. Chat ------------------------------ Support keyboard-based text selection of the chat input. Mouse-based selection could be support in the future when we decide to add something like an ingame UI cursor. Support smooth up and down scrolling of the chat input, removing the old hack that offsets the input string to simulate scrolling. Console ------------------------------ Also support mouse-based text selection of the command input. Only text from either the command input or the console log can be selected at the same time. This ensures that Ctrl+C will always copy the text that is currently visually selected in the console. Check for Ctrl+C input event in event handler instead of in render function, to hopefully fix the issue that copying does not work sometimes (closes #5974 until further notice). When Ctrl+C is used to copy text from the console log, the selection is cleared. This should make it more clear when text was copied from the log. Fix an issue that was preventing the console log selection from being cleared, when all log lines are selected. Remove Ctrl+A/E hotkeys that move cursor to beginning/end respectively. Ctrl+A now selectes all text like for all other inputs. Home and End keys can still be used to go the beginning and end. Remove Ctrl+U/K hotkeys that clear everything before/after the cursor respectively. Hold shift and use Home/End to select everything instead. IME support ------------------------------ Render list of IME candidates in the client on Windows, so the candidate list can also be viewed in fullscreen mode. There is no API available to retrieve a candidate list on the other operating systems. Improve composition rendering by underlining the composition text instead of putting it in square brackets. Track active input globally to properly activate and deactivate IME through the SDL functions. Closes #1030. Closes #1008. Password rendering ------------------------------ Fix rendering of passwords containing unicode. Instead of rendering one star character for each UTF-8 `char`, render on star for every unicode codepoint. Show the composition text also for passwords. Without seeing the composition text it's hard to type a password containing those characters. The candidate window exposes the composition anyway. If you don't want to expose your password this way, e.g. while streaming, you could: 1. Use a latin password and switch off the IME for the password input with the IME hotkey. 2. Blank your screen with an external program while you are streaming and entering passwords. 3. Use binds to authenticate in rcon or to set the server browser password. Refactoring ------------------------------ Move all text input logic and general rendering to `CLineInput`. A `CLineInput` is associated with a particular `char` buffer given as a pointer either in the constructor or with `SetBuffer`. The maximum byte size of the buffer must also be specified. The maximum length in unicode codepoints can also be specified separately (e.g. on upstream, name are limited by the number of unicode codepoints instead). Add `CLineInputBuffered`, which is a `CLineInput` that own a `char` buffer of a fixed size, which is specified as a template argument. As `CLineInput` does not own a buffer anymore, this reduces duplicate code for line inputs that need their own buffer. Add `CLineInputNumber` which has additional convenience functions to consider the text as an `int` or `float`, to reduce duplicate code in those cases. In the future we could also add an input filter function so that only numbers can be entered in the number input. Add `CLineInput::SetClipboardLineCallback` to handle the case that multiple lines of text are pasted into a lineinput. This reduces duplicate code, as this behavior was previously implemented separately for chat and console. The behavior is also fixed to be consistent with the console on Windows, so the first line being pasted edits the current input text and then sends it instead of being sent on its own without the existing input text. Add `CalcFontSizeAndBoundingBox` to UI to reduce duplicate code. Expose `CalcAlignedCursorPos` as static member function to reuse it for line input. Dispatch input events to UI inputs through the event handler instead of storing them in a duplicate buffer. Use `size_t` for line input cursor position, length etc. and for `str_utf8_stats`. Add `IButtonColorFunction` to UI to describe a functions that defines colors for the Default, Active and Hovered states of UI elements. Add some default button color functions. Use button color function to reduce duplicate code in scrollbar rendering. Use `vec2` instead of two `floats` to represent the mouse positions in the text renderer. Remove `CaretPosition` again, as it does not calculate the correct Y position near line breaks due to the wrapping being different when not rendering the entire string. Instead, calculate the exact caret position when rending a text container and store the caret position in the text cursor for later use. IME usage guide (Windows) ------------------------------ 1. Install the respective language and the Microsoft-IME keyboard (e.g. for Chinese, Japanese or Korean). 2. Launch the game (or a text editor to first try out the IME). Note that Windows may track the input language separately for every application. You can change this in the Windows input settings so the input language is changed globally. 2. Switch the input language using the hotkey Windows+Space or another hotkey that you configured in the Windows input settings (Alt+Shift is the default, but you should consider disabling it, to avoid accidentally changing the input language while playing). 3. Switch from Latin/English input mode to the respective asian input mode. - Chinese: Use Ctrl+Space to switch between English and Chinese input mode. You can change this hotkey in the IME's settings. - Japanese: Use Ctrl+Space to switch between Alphanumeric and Hiragana/Katakana input mode. You can change this hotkey in the IME's settings. - Korean: Use Right Alt to switch between English and Hangul input mode. You cannot change this hotkey as of yet. - Note that the input mode is also tracked per application, but there is no setting to change this behavior as far as I know, so you'll need to switch for every application separately. 4. Start typing. The underlined text is the current composition text. While a composition is active, you can only edit the composition text. Confirm the composition with Space or by selecting a candidate from the candidate list with the arrow keys. Cancel the composition with Escape or by using Backspace to delete the composition text. Note that not all languages offer a candidate list. SDL version-specific issues ------------------------------ - 2.26.5, 2.24.2, 2.0.22: IME candidates work. But there are minor bugs when moving the composition cursor. - 2.0.18, 2.0.20: IME candidates work. - 2.0.16 (our current version): IME candidates cannot be determined with Windows API. Windows tries to draw the composition window like before, so this does not work in fullscreen mode. - 2.0.8 (upstream 0.7): IME candidates work. But this SDL version is too old for us.
2023-01-03 21:28:38 +00:00
static CLineInput s_NameInput;
s_NameInput.SetBuffer(pCurrentLayer->m_aName, sizeof(pCurrentLayer->m_aName));
if(pEditor->DoEditBox(&s_NameInput, &EditBox, 10.0f))
fixed few things in th editor
2011-07-20 20:18:31 +00:00
pEditor->m_Map.m_Modified = true;
ability to name groups and layers
2011-07-12 01:14:46 +00:00
}
Refactor `CEditor:::PopupLayer`, remove `CEditor::IsSpecialLayer` - Use `pCurrentLayer` instead of `pEditor->GetSelectedLayer(0)` everywhere. - Remove unnecessary null-checks of `pCurrentLayer`. - Use `CLayer::IsEntitiesLayer` instead of `CEditor::IsSpecialLayer` and remove the latter function. - Restructure UI layout code and variables.
2023-01-22 10:58:09 +00:00
// spacing if any button was rendered
if(!EntitiesLayer || pEditor->m_Map.m_pGameLayer != pCurrentLayer)
View.HSplitBottom(10.0f, &View, nullptr);
added "Whitespace and line Endings cleanup" by GreYFoX
2011-04-13 18:37:12 +00:00
editor update and other stuff
2008-01-17 23:09:49 +00:00
enum
{
Run clang-format Purely automatic change. In case of conflict with this change, apply the other change and rerun the formatting to restore it: $ python scripts/fix_style.py
2020-09-26 19:41:58 +00:00
PROP_GROUP = 0,
editor update and other stuff
2008-01-17 23:09:49 +00:00
PROP_ORDER,
fixed bug in text rendering. added option for detail layers
2008-03-21 17:39:09 +00:00
PROP_HQ,
editor update and other stuff
2008-01-17 23:09:49 +00:00
NUM_PROPS,
};
added "Whitespace and line Endings cleanup" by GreYFoX
2011-04-13 18:37:12 +00:00
copied refactor to trunk
2010-05-29 07:25:38 +00:00
CProperty aProps[] = {
Format vector variables names (fixes #5209)
2022-06-11 19:38:18 +00:00
{"Group", pEditor->m_SelectedGroup, PROPTYPE_INT_STEP, 0, (int)pEditor->m_Map.m_vpGroups.size() - 1},
Fix minimum/maximum values of editor properties The Order-property maximum value was too large, so it was temporarily (only visually) possible to go beyond the maximum. The minimum/maximum values for the Color-property were incorrect and redundant, as `PROPTYPE_COLOR` is used for RGBA color properties and not for envelope IDs.
2022-09-04 11:06:15 +00:00
{"Order", pEditor->m_vSelectedLayers[0], PROPTYPE_INT_STEP, 0, (int)pCurrentGroup->m_vpLayers.size() - 1},
Refactor `CEditor:::PopupLayer`, remove `CEditor::IsSpecialLayer` - Use `pCurrentLayer` instead of `pEditor->GetSelectedLayer(0)` everywhere. - Remove unnecessary null-checks of `pCurrentLayer`. - Use `CLayer::IsEntitiesLayer` instead of `CEditor::IsSpecialLayer` and remove the latter function. - Restructure UI layout code and variables.
2023-01-22 10:58:09 +00:00
{"Detail", pCurrentLayer->m_Flags & LAYERFLAG_DETAIL, PROPTYPE_BOOL, 0, 1},
Use nullptr in generated and editor -Wzero-as-null-pointer-constant
2022-06-13 16:28:13 +00:00
{nullptr},
editor update and other stuff
2008-01-17 23:09:49 +00:00
};
copied refactor to trunk
2010-05-29 07:25:38 +00:00
Add `CLayer::IsEntitiesLayer` to reduce duplicate code
2023-01-17 21:39:31 +00:00
// don't use Group and Detail from the selection if this is an entities layer
Refactor `CEditor:::PopupLayer`, remove `CEditor::IsSpecialLayer` - Use `pCurrentLayer` instead of `pEditor->GetSelectedLayer(0)` everywhere. - Remove unnecessary null-checks of `pCurrentLayer`. - Use `CLayer::IsEntitiesLayer` instead of `CEditor::IsSpecialLayer` and remove the latter function. - Restructure UI layout code and variables.
2023-01-22 10:58:09 +00:00
if(EntitiesLayer)
copied refactor to trunk
2010-05-29 07:25:38 +00:00
{
aProps[0].m_Type = PROPTYPE_NULL;
Total Cleanup Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-27 19:41:41 +00:00
aProps[2].m_Type = PROPTYPE_NULL;
}
added "Whitespace and line Endings cleanup" by GreYFoX
2011-04-13 18:37:12 +00:00
copied refactor to trunk
2010-05-29 07:25:38 +00:00
static int s_aIds[NUM_PROPS] = {0};
int NewVal = 0;
added notification for unsaved map data and a confirmation for overwriting an existing map in the editor. Closes #115
2011-03-21 23:31:42 +00:00
int Prop = pEditor->DoProperties(&View, aProps, s_aIds, &NewVal);
if(Prop != -1)
Refactor `CEditor::PopupLayer`
2023-04-01 21:19:04 +00:00
{
added notification for unsaved map data and a confirmation for overwriting an existing map in the editor. Closes #115
2011-03-21 23:31:42 +00:00
pEditor->m_Map.m_Modified = true;
Refactor `CEditor::PopupLayer`
2023-04-01 21:19:04 +00:00
}
added "Whitespace and line Endings cleanup" by GreYFoX
2011-04-13 18:37:12 +00:00
copied refactor to trunk
2010-05-29 07:25:38 +00:00
if(Prop == PROP_ORDER)
Refactor `CEditor::PopupLayer`
2023-04-01 21:19:04 +00:00
{
Format vector variables names (fixes #5209)
2022-06-11 19:38:18 +00:00
pEditor->SelectLayer(pCurrentGroup->SwapLayers(pEditor->m_vSelectedLayers[0], NewVal));
Refactor `CEditor::PopupLayer`
2023-04-01 21:19:04 +00:00
}
Refactor `CEditor:::PopupLayer`, remove `CEditor::IsSpecialLayer` - Use `pCurrentLayer` instead of `pEditor->GetSelectedLayer(0)` everywhere. - Remove unnecessary null-checks of `pCurrentLayer`. - Use `CLayer::IsEntitiesLayer` instead of `CEditor::IsSpecialLayer` and remove the latter function. - Restructure UI layout code and variables.
2023-01-22 10:58:09 +00:00
else if(Prop == PROP_GROUP)
editor update and other stuff
2008-01-17 23:09:49 +00:00
{
Format vector variables names (fixes #5209)
2022-06-11 19:38:18 +00:00
if(NewVal >= 0 && (size_t)NewVal < pEditor->m_Map.m_vpGroups.size())
editor update and other stuff
2008-01-17 23:09:49 +00:00
{
Format vector variables names (fixes #5209)
2022-06-11 19:38:18 +00:00
auto Position = std::find(pCurrentGroup->m_vpLayers.begin(), pCurrentGroup->m_vpLayers.end(), pCurrentLayer);
if(Position != pCurrentGroup->m_vpLayers.end())
pCurrentGroup->m_vpLayers.erase(Position);
pEditor->m_Map.m_vpGroups[NewVal]->m_vpLayers.push_back(pCurrentLayer);
copied refactor to trunk
2010-05-29 07:25:38 +00:00
pEditor->m_SelectedGroup = NewVal;
Format vector variables names (fixes #5209)
2022-06-11 19:38:18 +00:00
pEditor->SelectLayer(pEditor->m_Map.m_vpGroups[NewVal]->m_vpLayers.size() - 1);
editor update and other stuff
2008-01-17 23:09:49 +00:00
}
}
Refactor `CEditor:::PopupLayer`, remove `CEditor::IsSpecialLayer` - Use `pCurrentLayer` instead of `pEditor->GetSelectedLayer(0)` everywhere. - Remove unnecessary null-checks of `pCurrentLayer`. - Use `CLayer::IsEntitiesLayer` instead of `CEditor::IsSpecialLayer` and remove the latter function. - Restructure UI layout code and variables.
2023-01-22 10:58:09 +00:00
else if(Prop == PROP_HQ)
fixed bug in text rendering. added option for detail layers
2008-03-21 17:39:09 +00:00
{
copied refactor to trunk
2010-05-29 07:25:38 +00:00
pCurrentLayer->m_Flags &= ~LAYERFLAG_DETAIL;
if(NewVal)
pCurrentLayer->m_Flags |= LAYERFLAG_DETAIL;
fixed bug in text rendering. added option for detail layers
2008-03-21 17:39:09 +00:00
}
added "Whitespace and line Endings cleanup" by GreYFoX
2011-04-13 18:37:12 +00:00
copied refactor to trunk
2010-05-29 07:25:38 +00:00
return pCurrentLayer->RenderProperties(&View);
editor update and other stuff
2008-01-17 23:09:49 +00:00
}
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
CUI::EPopupMenuFunctionResult CEditor::PopupQuad(void *pContext, CUIRect View, bool Active)
editor update and other stuff
2008-01-17 23:09:49 +00:00
{
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
CEditor *pEditor = static_cast<CEditor *>(pContext);
More vector naming format
2022-06-15 17:34:41 +00:00
std::vector<CQuad *> vpQuads = pEditor->GetSelectedQuads();
CQuad *pCurrentQuad = vpQuads[pEditor->m_SelectedQuadIndex];
Refactor `CEditor::PopupQuad`
2023-04-02 09:43:17 +00:00
CLayerQuads *pLayer = static_cast<CLayerQuads *>(pEditor->GetSelectedLayerType(0, LAYERTYPE_QUADS));
editor update and other stuff
2008-01-17 23:09:49 +00:00
copied refactor to trunk
2010-05-29 07:25:38 +00:00
CUIRect Button;
added "Whitespace and line Endings cleanup" by GreYFoX
2011-04-13 18:37:12 +00:00
added option to delete quads
2008-03-02 15:59:52 +00:00
// delete button
copied refactor to trunk
2010-05-29 07:25:38 +00:00
View.HSplitBottom(12.0f, &View, &Button);
static int s_DeleteButton = 0;
removed localisation in the editor
2011-03-20 16:04:03 +00:00
if(pEditor->DoButton_Editor(&s_DeleteButton, "Delete", 0, &Button, 0, "Deletes the current quad"))
added option to delete quads
2008-03-02 15:59:52 +00:00
{
copied refactor to trunk
2010-05-29 07:25:38 +00:00
if(pLayer)
added option to delete quads
2008-03-02 15:59:52 +00:00
{
added notification for unsaved map data and a confirmation for overwriting an existing map in the editor. Closes #115
2011-03-21 23:31:42 +00:00
pEditor->m_Map.m_Modified = true;
selecting multiple quads
2018-08-13 09:11:56 +00:00
pEditor->DeleteSelectedQuads();
added option to delete quads
2008-03-02 15:59:52 +00:00
}
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
return CUI::POPUP_CLOSE_CURRENT;
added option to delete quads
2008-03-02 15:59:52 +00:00
}
added button to resize a quad based on the aspect ratio of the image. Closes #169
2010-09-19 15:12:09 +00:00
// aspect ratio button
Refactor `CEditor::PopupQuad`
2023-04-02 09:43:17 +00:00
View.HSplitBottom(10.0f, &View, nullptr);
added quad positioning in the editor
2011-03-29 10:08:46 +00:00
View.HSplitBottom(12.0f, &View, &Button);
Format vector variables names (fixes #5209)
2022-06-11 19:38:18 +00:00
if(pLayer && pLayer->m_Image >= 0 && (size_t)pLayer->m_Image < pEditor->m_Map.m_vpImages.size())
added button to resize a quad based on the aspect ratio of the image. Closes #169
2010-09-19 15:12:09 +00:00
{
static int s_AspectRatioButton = 0;
removed localisation in the editor
2011-03-20 16:04:03 +00:00
if(pEditor->DoButton_Editor(&s_AspectRatioButton, "Aspect ratio", 0, &Button, 0, "Resizes the current Quad based on the aspect ratio of the image"))
added button to resize a quad based on the aspect ratio of the image. Closes #169
2010-09-19 15:12:09 +00:00
{
More vector naming format
2022-06-15 17:34:41 +00:00
for(auto &pQuad : vpQuads)
added button to resize a quad based on the aspect ratio of the image. Closes #169
2010-09-19 15:12:09 +00:00
{
Use std::vector instead of array in editor
2022-05-24 09:24:33 +00:00
int Top = pQuad->m_aPoints[0].y;
int Left = pQuad->m_aPoints[0].x;
int Right = pQuad->m_aPoints[0].x;
added button to resize a quad based on the aspect ratio of the image. Closes #169
2010-09-19 15:12:09 +00:00
selecting multiple quads
2018-08-13 09:11:56 +00:00
for(int k = 1; k < 4; k++)
{
Use std::vector instead of array in editor
2022-05-24 09:24:33 +00:00
if(pQuad->m_aPoints[k].y < Top)
Top = pQuad->m_aPoints[k].y;
if(pQuad->m_aPoints[k].x < Left)
Left = pQuad->m_aPoints[k].x;
if(pQuad->m_aPoints[k].x > Right)
Right = pQuad->m_aPoints[k].x;
selecting multiple quads
2018-08-13 09:11:56 +00:00
}
added "Whitespace and line Endings cleanup" by GreYFoX
2011-04-13 18:37:12 +00:00
Refactor `CEditor::PopupQuad`
2023-04-02 09:43:17 +00:00
const int Height = (Right - Left) * pEditor->m_Map.m_vpImages[pLayer->m_Image]->m_Height / pEditor->m_Map.m_vpImages[pLayer->m_Image]->m_Width;
selecting multiple quads
2018-08-13 09:11:56 +00:00
Use std::vector instead of array in editor
2022-05-24 09:24:33 +00:00
pQuad->m_aPoints[0].x = Left;
pQuad->m_aPoints[0].y = Top;
pQuad->m_aPoints[1].x = Right;
pQuad->m_aPoints[1].y = Top;
pQuad->m_aPoints[2].x = Left;
pQuad->m_aPoints[2].y = Top + Height;
pQuad->m_aPoints[3].x = Right;
pQuad->m_aPoints[3].y = Top + Height;
selecting multiple quads
2018-08-13 09:11:56 +00:00
pEditor->m_Map.m_Modified = true;
}
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
return CUI::POPUP_CLOSE_CURRENT;
added button to resize a quad based on the aspect ratio of the image. Closes #169
2010-09-19 15:12:09 +00:00
}
added quad positioning in the editor
2011-03-29 10:08:46 +00:00
}
// align button
Refactor `CEditor::PopupQuad`
2023-04-02 09:43:17 +00:00
View.HSplitBottom(6.0f, &View, nullptr);
added quad positioning in the editor
2011-03-29 10:08:46 +00:00
View.HSplitBottom(12.0f, &View, &Button);
static int s_AlignButton = 0;
if(pEditor->DoButton_Editor(&s_AlignButton, "Align", 0, &Button, 0, "Aligns coordinates of the quad points"))
{
More vector naming format
2022-06-15 17:34:41 +00:00
for(auto &pQuad : vpQuads)
added quad positioning in the editor
2011-03-29 10:08:46 +00:00
{
selecting multiple quads
2018-08-13 09:11:56 +00:00
for(int k = 1; k < 4; k++)
{
Use std::vector instead of array in editor
2022-05-24 09:24:33 +00:00
pQuad->m_aPoints[k].x = 1000.0f * (pQuad->m_aPoints[k].x / 1000);
pQuad->m_aPoints[k].y = 1000.0f * (pQuad->m_aPoints[k].y / 1000);
selecting multiple quads
2018-08-13 09:11:56 +00:00
}
pEditor->m_Map.m_Modified = true;
added quad positioning in the editor
2011-03-29 10:08:46 +00:00
}
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
return CUI::POPUP_CLOSE_CURRENT;
added button to resize a quad based on the aspect ratio of the image. Closes #169
2010-09-19 15:12:09 +00:00
}
// square button
Refactor `CEditor::PopupQuad`
2023-04-02 09:43:17 +00:00
View.HSplitBottom(6.0f, &View, nullptr);
copied refactor to trunk
2010-05-29 07:25:38 +00:00
View.HSplitBottom(12.0f, &View, &Button);
static int s_Button = 0;
removed localisation in the editor
2011-03-20 16:04:03 +00:00
if(pEditor->DoButton_Editor(&s_Button, "Square", 0, &Button, 0, "Squares the current quad"))
editor update and other stuff
2008-01-17 23:09:49 +00:00
{
More vector naming format
2022-06-15 17:34:41 +00:00
for(auto &pQuad : vpQuads)
editor update and other stuff
2008-01-17 23:09:49 +00:00
{
Use std::vector instead of array in editor
2022-05-24 09:24:33 +00:00
int Top = pQuad->m_aPoints[0].y;
int Left = pQuad->m_aPoints[0].x;
int Bottom = pQuad->m_aPoints[0].y;
int Right = pQuad->m_aPoints[0].x;
added "Whitespace and line Endings cleanup" by GreYFoX
2011-04-13 18:37:12 +00:00
selecting multiple quads
2018-08-13 09:11:56 +00:00
for(int k = 1; k < 4; k++)
{
Use std::vector instead of array in editor
2022-05-24 09:24:33 +00:00
if(pQuad->m_aPoints[k].y < Top)
Top = pQuad->m_aPoints[k].y;
if(pQuad->m_aPoints[k].x < Left)
Left = pQuad->m_aPoints[k].x;
if(pQuad->m_aPoints[k].y > Bottom)
Bottom = pQuad->m_aPoints[k].y;
if(pQuad->m_aPoints[k].x > Right)
Right = pQuad->m_aPoints[k].x;
selecting multiple quads
2018-08-13 09:11:56 +00:00
}
Use std::vector instead of array in editor
2022-05-24 09:24:33 +00:00
pQuad->m_aPoints[0].x = Left;
pQuad->m_aPoints[0].y = Top;
pQuad->m_aPoints[1].x = Right;
pQuad->m_aPoints[1].y = Top;
pQuad->m_aPoints[2].x = Left;
pQuad->m_aPoints[2].y = Bottom;
pQuad->m_aPoints[3].x = Right;
pQuad->m_aPoints[3].y = Bottom;
selecting multiple quads
2018-08-13 09:11:56 +00:00
pEditor->m_Map.m_Modified = true;
}
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
return CUI::POPUP_CLOSE_CURRENT;
editor update and other stuff
2008-01-17 23:09:49 +00:00
}
Knife tool
2022-02-26 17:49:06 +00:00
// slice button
Refactor `CEditor::PopupQuad`
2023-04-02 09:43:17 +00:00
View.HSplitBottom(6.0f, &View, nullptr);
Knife tool
2022-02-26 17:49:06 +00:00
View.HSplitBottom(12.0f, &View, &Button);
static int s_SliceButton = 0;
if(pEditor->DoButton_Editor(&s_SliceButton, "Slice", 0, &Button, 0, "Enables quad knife mode"))
{
pEditor->m_QuadKnifeCount = 0;
pEditor->m_QuadKnifeActive = true;
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
return CUI::POPUP_CLOSE_CURRENT;
Knife tool
2022-02-26 17:49:06 +00:00
}
editor update and other stuff
2008-01-17 23:09:49 +00:00
enum
{
editor: added order button in quads popup
2022-09-10 13:07:32 +00:00
PROP_ORDER = 0,
PROP_POS_X,
added quad positioning in the editor
2011-03-29 10:08:46 +00:00
PROP_POS_Y,
PROP_POS_ENV,
editor update and other stuff
2008-01-17 23:09:49 +00:00
PROP_POS_ENV_OFFSET,
PROP_COLOR_ENV,
PROP_COLOR_ENV_OFFSET,
NUM_PROPS,
};
added "Whitespace and line Endings cleanup" by GreYFoX
2011-04-13 18:37:12 +00:00
Refactor `CEditor::PopupQuad`
2023-04-02 09:43:17 +00:00
const int NumQuads = pLayer ? (int)pLayer->m_vQuads.size() : 0;
copied refactor to trunk
2010-05-29 07:25:38 +00:00
CProperty aProps[] = {
editor: added order button in quads popup
2022-09-10 13:07:32 +00:00
{"Order", pEditor->m_vSelectedQuads[pEditor->m_SelectedQuadIndex], PROPTYPE_INT_STEP, 0, NumQuads},
Use fixed point conversion consistently
2020-09-22 12:28:14 +00:00
{"Pos X", fx2i(pCurrentQuad->m_aPoints[4].x), PROPTYPE_INT_SCROLL, -1000000, 1000000},
{"Pos Y", fx2i(pCurrentQuad->m_aPoints[4].y), PROPTYPE_INT_SCROLL, -1000000, 1000000},
Style
2020-09-22 12:47:21 +00:00
{"Pos. Env", pCurrentQuad->m_PosEnv + 1, PROPTYPE_ENVELOPE, 0, 0},
selecting multiple quads
2018-08-13 09:11:56 +00:00
{"Pos. TO", pCurrentQuad->m_PosEnvOffset, PROPTYPE_INT_SCROLL, -1000000, 1000000},
Style
2020-09-22 12:47:21 +00:00
{"Color Env", pCurrentQuad->m_ColorEnv + 1, PROPTYPE_ENVELOPE, 0, 0},
selecting multiple quads
2018-08-13 09:11:56 +00:00
{"Color TO", pCurrentQuad->m_ColorEnvOffset, PROPTYPE_INT_SCROLL, -1000000, 1000000},
Use nullptr in generated and editor -Wzero-as-null-pointer-constant
2022-06-13 16:28:13 +00:00
{nullptr},
editor update and other stuff
2008-01-17 23:09:49 +00:00
};
added "Whitespace and line Endings cleanup" by GreYFoX
2011-04-13 18:37:12 +00:00
copied refactor to trunk
2010-05-29 07:25:38 +00:00
static int s_aIds[NUM_PROPS] = {0};
int NewVal = 0;
added notification for unsaved map data and a confirmation for overwriting an existing map in the editor. Closes #115
2011-03-21 23:31:42 +00:00
int Prop = pEditor->DoProperties(&View, aProps, s_aIds, &NewVal);
if(Prop != -1)
Refactor `CEditor::PopupQuad`
2023-04-02 09:43:17 +00:00
{
added notification for unsaved map data and a confirmation for overwriting an existing map in the editor. Closes #115
2011-03-21 23:31:42 +00:00
pEditor->m_Map.m_Modified = true;
Refactor `CEditor::PopupQuad`
2023-04-02 09:43:17 +00:00
}
added "Whitespace and line Endings cleanup" by GreYFoX
2011-04-13 18:37:12 +00:00
Refactor `CEditor::PopupQuad`
2023-04-02 09:43:17 +00:00
const float OffsetX = i2fx(NewVal) - pCurrentQuad->m_aPoints[4].x;
const float OffsetY = i2fx(NewVal) - pCurrentQuad->m_aPoints[4].y;
selecting multiple quads
2018-08-13 09:11:56 +00:00
editor: added order button in quads popup
2022-09-10 13:07:32 +00:00
if(Prop == PROP_ORDER && pLayer)
{
Refactor `CEditor::PopupQuad`
2023-04-02 09:43:17 +00:00
const int QuadIndex = pLayer->SwapQuads(pEditor->m_vSelectedQuads[pEditor->m_SelectedQuadIndex], NewVal);
editor: added order button in quads popup
2022-09-10 13:07:32 +00:00
pEditor->m_vSelectedQuads[pEditor->m_SelectedQuadIndex] = QuadIndex;
}
More vector naming format
2022-06-15 17:34:41 +00:00
for(auto &pQuad : vpQuads)
just list the correct envelope types(colour/pos) when linking an envelope to a quad/tile layer
2011-08-06 20:30:18 +00:00
{
selecting multiple quads
2018-08-13 09:11:56 +00:00
if(Prop == PROP_POS_X)
just list the correct envelope types(colour/pos) when linking an envelope to a quad/tile layer
2011-08-06 20:30:18 +00:00
{
Use std::vector instead of array in editor
2022-05-24 09:24:33 +00:00
for(auto &Point : pQuad->m_aPoints)
Fix variable names manually
2020-10-26 14:14:07 +00:00
Point.x += OffsetX;
just list the correct envelope types(colour/pos) when linking an envelope to a quad/tile layer
2011-08-06 20:30:18 +00:00
}
Refactor `CEditor::PopupQuad`
2023-04-02 09:43:17 +00:00
else if(Prop == PROP_POS_Y)
just list the correct envelope types(colour/pos) when linking an envelope to a quad/tile layer
2011-08-06 20:30:18 +00:00
{
Use std::vector instead of array in editor
2022-05-24 09:24:33 +00:00
for(auto &Point : pQuad->m_aPoints)
Fix variable names manually
2020-10-26 14:14:07 +00:00
Point.y += OffsetY;
selecting multiple quads
2018-08-13 09:11:56 +00:00
}
Refactor `CEditor::PopupQuad`
2023-04-02 09:43:17 +00:00
else if(Prop == PROP_POS_ENV)
selecting multiple quads
2018-08-13 09:11:56 +00:00
{
Format vector variables names (fixes #5209)
2022-06-11 19:38:18 +00:00
int Index = clamp(NewVal - 1, -1, (int)pEditor->m_Map.m_vpEnvelopes.size() - 1);
use ValueSelector for envelope selection closes #3598
2023-03-12 07:31:21 +00:00
int StepDirection = Index < pQuad->m_PosEnv ? -1 : 1;
if(StepDirection != 0)
selecting multiple quads
2018-08-13 09:11:56 +00:00
{
use ValueSelector for envelope selection closes #3598
2023-03-12 07:31:21 +00:00
for(; Index >= -1 && Index < (int)pEditor->m_Map.m_vpEnvelopes.size(); Index += StepDirection)
Refactor `CEditor::PopupQuad`
2023-04-02 09:43:17 +00:00
{
Format vector variables names (fixes #5209)
2022-06-11 19:38:18 +00:00
if(Index == -1 || pEditor->m_Map.m_vpEnvelopes[Index]->m_Channels == 3)
selecting multiple quads
2018-08-13 09:11:56 +00:00
{
Use std::vector instead of array in editor
2022-05-24 09:24:33 +00:00
pQuad->m_PosEnv = Index;
selecting multiple quads
2018-08-13 09:11:56 +00:00
break;
}
Refactor `CEditor::PopupQuad`
2023-04-02 09:43:17 +00:00
}
selecting multiple quads
2018-08-13 09:11:56 +00:00
}
}
Refactor `CEditor::PopupQuad`
2023-04-02 09:43:17 +00:00
else if(Prop == PROP_POS_ENV_OFFSET)
{
Use std::vector instead of array in editor
2022-05-24 09:24:33 +00:00
pQuad->m_PosEnvOffset = NewVal;
Refactor `CEditor::PopupQuad`
2023-04-02 09:43:17 +00:00
}
else if(Prop == PROP_COLOR_ENV)
selecting multiple quads
2018-08-13 09:11:56 +00:00
{
Format vector variables names (fixes #5209)
2022-06-11 19:38:18 +00:00
int Index = clamp(NewVal - 1, -1, (int)pEditor->m_Map.m_vpEnvelopes.size() - 1);
use ValueSelector for envelope selection closes #3598
2023-03-12 07:31:21 +00:00
int StepDirection = Index < pQuad->m_ColorEnv ? -1 : 1;
if(StepDirection != 0)
selecting multiple quads
2018-08-13 09:11:56 +00:00
{
use ValueSelector for envelope selection closes #3598
2023-03-12 07:31:21 +00:00
for(; Index >= -1 && Index < (int)pEditor->m_Map.m_vpEnvelopes.size(); Index += StepDirection)
Refactor `CEditor::PopupQuad`
2023-04-02 09:43:17 +00:00
{
Format vector variables names (fixes #5209)
2022-06-11 19:38:18 +00:00
if(Index == -1 || pEditor->m_Map.m_vpEnvelopes[Index]->m_Channels == 4)
selecting multiple quads
2018-08-13 09:11:56 +00:00
{
Use std::vector instead of array in editor
2022-05-24 09:24:33 +00:00
pQuad->m_ColorEnv = Index;
selecting multiple quads
2018-08-13 09:11:56 +00:00
break;
}
Refactor `CEditor::PopupQuad`
2023-04-02 09:43:17 +00:00
}
selecting multiple quads
2018-08-13 09:11:56 +00:00
}
just list the correct envelope types(colour/pos) when linking an envelope to a quad/tile layer
2011-08-06 20:30:18 +00:00
}
Refactor `CEditor::PopupQuad`
2023-04-02 09:43:17 +00:00
else if(Prop == PROP_COLOR_ENV_OFFSET)
{
Use std::vector instead of array in editor
2022-05-24 09:24:33 +00:00
pQuad->m_ColorEnvOffset = NewVal;
Refactor `CEditor::PopupQuad`
2023-04-02 09:43:17 +00:00
}
just list the correct envelope types(colour/pos) when linking an envelope to a quad/tile layer
2011-08-06 20:30:18 +00:00
}
added "Whitespace and line Endings cleanup" by GreYFoX
2011-04-13 18:37:12 +00:00
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
return CUI::POPUP_KEEP_OPEN;
editor update and other stuff
2008-01-17 23:09:49 +00:00
}
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
CUI::EPopupMenuFunctionResult CEditor::PopupSource(void *pContext, CUIRect View, bool Active)
Add editor support for editing sound source properties
2014-10-10 17:11:21 +00:00
{
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
CEditor *pEditor = static_cast<CEditor *>(pContext);
Add editor support for editing sound source properties
2014-10-10 17:11:21 +00:00
CSoundSource *pSource = pEditor->GetSelectedSource();
CUIRect Button;
// delete button
View.HSplitBottom(12.0f, &View, &Button);
static int s_DeleteButton = 0;
if(pEditor->DoButton_Editor(&s_DeleteButton, "Delete", 0, &Button, 0, "Deletes the current source"))
{
CLayerSounds *pLayer = (CLayerSounds *)pEditor->GetSelectedLayerType(0, LAYERTYPE_SOUNDS);
if(pLayer)
{
pEditor->m_Map.m_Modified = true;
Format vector variables names (fixes #5209)
2022-06-11 19:38:18 +00:00
pLayer->m_vSources.erase(pLayer->m_vSources.begin() + pEditor->m_SelectedSource);
Add editor support for editing sound source properties
2014-10-10 17:11:21 +00:00
pEditor->m_SelectedSource--;
}
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
return CUI::POPUP_CLOSE_CURRENT;
Add editor support for editing sound source properties
2014-10-10 17:11:21 +00:00
}
Working on adding editor UI support for sound shapes
2014-11-28 19:25:43 +00:00
// Sound shape button
CUIRect ShapeButton;
Use nullptr in generated and editor -Wzero-as-null-pointer-constant
2022-06-13 16:28:13 +00:00
View.HSplitBottom(3.0f, &View, nullptr);
Working on adding editor UI support for sound shapes
2014-11-28 19:25:43 +00:00
View.HSplitBottom(12.0f, &View, &ShapeButton);
Refactor `CEditor::PopupSource`
2023-04-01 21:19:30 +00:00
static const char *s_apShapeNames[CSoundShape::NUM_SHAPES] = {
Working on adding editor UI support for sound shapes
2014-11-28 19:25:43 +00:00
"Rectangle",
Run clang-format Purely automatic change. In case of conflict with this change, apply the other change and rerun the formatting to restore it: $ python scripts/fix_style.py
2020-09-26 19:41:58 +00:00
"Circle"};
Working on adding editor UI support for sound shapes
2014-11-28 19:25:43 +00:00
Run clang-format Purely automatic change. In case of conflict with this change, apply the other change and rerun the formatting to restore it: $ python scripts/fix_style.py
2020-09-26 19:41:58 +00:00
pSource->m_Shape.m_Type = pSource->m_Shape.m_Type % CSoundShape::NUM_SHAPES; // prevent out of array errors
Check array boundary for shape type
2014-11-30 10:33:44 +00:00
Refactor `CEditor::PopupSource`
2023-04-01 21:19:30 +00:00
static int s_ShapeTypeButton = 0;
Huge variable naming format Fix pointer and pointer array variable naming Huge renaming to match our rules Used regex: (?!(return|delete)\b)\b\w+ (m_|ms_|g_|gs_|s_)[^a]\w+\[ (?!(return|delete)\b)\b\w+ (?!(m_|ms_|g_|gs_|s_))[^a]\w+\[ Further format static variables Format almost all pointer names accordingly Used regex: (?!(return)\b)\b\w+ \*(?!(m_p|p|s_p|m_ap|s_ap|g_p|g_ap|ap|gs_ap|ms_ap|gs_p|ms_p))\w+\b[^:\(p] clang-format Fix CI fail Fix misnamed non pointer as pointer and non array as array Used regex: (?!(return|delete)\b)\b\w+ (m_|ms_|g_|gs_|s_)p\w+\b (?!return\b)\b\w+ (ms_|m_|g_|gs_|s_)a\w+\b[^\[] clang-format Revert to SCREAMING_SNAKE_CASE and reinstate dead code
2022-06-30 22:36:32 +00:00
if(pEditor->DoButton_Editor(&s_ShapeTypeButton, s_apShapeNames[pSource->m_Shape.m_Type], 0, &ShapeButton, 0, "Change shape"))
Working on adding editor UI support for sound shapes
2014-11-28 19:25:43 +00:00
{
Run clang-format Purely automatic change. In case of conflict with this change, apply the other change and rerun the formatting to restore it: $ python scripts/fix_style.py
2020-09-26 19:41:58 +00:00
pSource->m_Shape.m_Type = (pSource->m_Shape.m_Type + 1) % CSoundShape::NUM_SHAPES;
Working on adding editor UI support for sound shapes
2014-11-28 19:25:43 +00:00
// set default values
switch(pSource->m_Shape.m_Type)
{
case CSoundShape::SHAPE_CIRCLE:
Run clang-format Purely automatic change. In case of conflict with this change, apply the other change and rerun the formatting to restore it: $ python scripts/fix_style.py
2020-09-26 19:41:58 +00:00
{
pSource->m_Shape.m_Circle.m_Radius = 1000.0f;
break;
}
Working on adding editor UI support for sound shapes
2014-11-28 19:25:43 +00:00
case CSoundShape::SHAPE_RECTANGLE:
Run clang-format Purely automatic change. In case of conflict with this change, apply the other change and rerun the formatting to restore it: $ python scripts/fix_style.py
2020-09-26 19:41:58 +00:00
{
pSource->m_Shape.m_Rectangle.m_Width = f2fx(1000.0f);
pSource->m_Shape.m_Rectangle.m_Height = f2fx(800.0f);
break;
}
Working on adding editor UI support for sound shapes
2014-11-28 19:25:43 +00:00
}
}
Fix whitespaces a bit
2015-07-09 00:08:14 +00:00
Add editor support for editing sound source properties
2014-10-10 17:11:21 +00:00
enum
{
Run clang-format Purely automatic change. In case of conflict with this change, apply the other change and rerun the formatting to restore it: $ python scripts/fix_style.py
2020-09-26 19:41:58 +00:00
PROP_POS_X = 0,
Add editor support for editing sound source properties
2014-10-10 17:11:21 +00:00
PROP_POS_Y,
PROP_LOOP,
Add option to enable/disable panning per voice
2014-11-30 11:23:05 +00:00
PROP_PAN,
Add editor support for editing sound source properties
2014-10-10 17:11:21 +00:00
PROP_TIME_DELAY,
Working on adding editor UI support for sound shapes
2014-11-28 19:25:43 +00:00
PROP_FALLOFF,
Add support for position envelopes to sound sources
2014-10-12 13:10:33 +00:00
PROP_POS_ENV,
PROP_POS_ENV_OFFSET,
Start adding a sound envelope
2014-10-11 14:05:36 +00:00
PROP_SOUND_ENV,
Add support for position envelopes to sound sources
2014-10-12 13:10:33 +00:00
PROP_SOUND_ENV_OFFSET,
Add editor support for editing sound source properties
2014-10-10 17:11:21 +00:00
NUM_PROPS,
};
CProperty aProps[] = {
run fix_style script
2020-09-22 13:42:20 +00:00
{"Pos X", pSource->m_Position.x / 1000, PROPTYPE_INT_SCROLL, -1000000, 1000000},
{"Pos Y", pSource->m_Position.y / 1000, PROPTYPE_INT_SCROLL, -1000000, 1000000},
Add editor support for editing sound source properties
2014-10-10 17:11:21 +00:00
{"Loop", pSource->m_Loop, PROPTYPE_BOOL, 0, 1},
Add option to enable/disable panning per voice
2014-11-30 11:23:05 +00:00
{"Pan", pSource->m_Pan, PROPTYPE_BOOL, 0, 1},
Add editor support for editing sound source properties
2014-10-10 17:11:21 +00:00
{"Delay", pSource->m_TimeDelay, PROPTYPE_INT_SCROLL, 0, 1000000},
Working on adding editor UI support for sound shapes
2014-11-28 19:25:43 +00:00
{"Falloff", pSource->m_Falloff, PROPTYPE_INT_SCROLL, 0, 255},
run fix_style script
2020-09-22 13:42:20 +00:00
{"Pos. Env", pSource->m_PosEnv + 1, PROPTYPE_ENVELOPE, 0, 0},
Add support for position envelopes to sound sources
2014-10-12 13:10:33 +00:00
{"Pos. TO", pSource->m_PosEnvOffset, PROPTYPE_INT_SCROLL, -1000000, 1000000},
run fix_style script
2020-09-22 13:42:20 +00:00
{"Sound Env", pSource->m_SoundEnv + 1, PROPTYPE_ENVELOPE, 0, 0},
set the correct variable
2020-09-22 12:50:04 +00:00
{"Sound. TO", pSource->m_SoundEnvOffset, PROPTYPE_INT_SCROLL, -1000000, 1000000},
Use nullptr in generated and editor -Wzero-as-null-pointer-constant
2022-06-13 16:28:13 +00:00
{nullptr},
Add editor support for editing sound source properties
2014-10-10 17:11:21 +00:00
};
static int s_aIds[NUM_PROPS] = {0};
int NewVal = 0;
int Prop = pEditor->DoProperties(&View, aProps, s_aIds, &NewVal);
if(Prop != -1)
Refactor `CEditor::PopupSource`
2023-04-01 21:19:30 +00:00
{
Add editor support for editing sound source properties
2014-10-10 17:11:21 +00:00
pEditor->m_Map.m_Modified = true;
Refactor `CEditor::PopupSource`
2023-04-01 21:19:30 +00:00
}
Add editor support for editing sound source properties
2014-10-10 17:11:21 +00:00
Run clang-format Purely automatic change. In case of conflict with this change, apply the other change and rerun the formatting to restore it: $ python scripts/fix_style.py
2020-09-26 19:41:58 +00:00
if(Prop == PROP_POS_X)
Refactor `CEditor::PopupSource`
2023-04-01 21:19:30 +00:00
{
Run clang-format Purely automatic change. In case of conflict with this change, apply the other change and rerun the formatting to restore it: $ python scripts/fix_style.py
2020-09-26 19:41:58 +00:00
pSource->m_Position.x = NewVal * 1000;
Refactor `CEditor::PopupSource`
2023-04-01 21:19:30 +00:00
}
else if(Prop == PROP_POS_Y)
{
Run clang-format Purely automatic change. In case of conflict with this change, apply the other change and rerun the formatting to restore it: $ python scripts/fix_style.py
2020-09-26 19:41:58 +00:00
pSource->m_Position.y = NewVal * 1000;
Refactor `CEditor::PopupSource`
2023-04-01 21:19:30 +00:00
}
else if(Prop == PROP_LOOP)
{
Run clang-format Purely automatic change. In case of conflict with this change, apply the other change and rerun the formatting to restore it: $ python scripts/fix_style.py
2020-09-26 19:41:58 +00:00
pSource->m_Loop = NewVal;
Refactor `CEditor::PopupSource`
2023-04-01 21:19:30 +00:00
}
else if(Prop == PROP_PAN)
{
Run clang-format Purely automatic change. In case of conflict with this change, apply the other change and rerun the formatting to restore it: $ python scripts/fix_style.py
2020-09-26 19:41:58 +00:00
pSource->m_Pan = NewVal;
Refactor `CEditor::PopupSource`
2023-04-01 21:19:30 +00:00
}
else if(Prop == PROP_TIME_DELAY)
{
Run clang-format Purely automatic change. In case of conflict with this change, apply the other change and rerun the formatting to restore it: $ python scripts/fix_style.py
2020-09-26 19:41:58 +00:00
pSource->m_TimeDelay = NewVal;
Refactor `CEditor::PopupSource`
2023-04-01 21:19:30 +00:00
}
else if(Prop == PROP_FALLOFF)
{
Run clang-format Purely automatic change. In case of conflict with this change, apply the other change and rerun the formatting to restore it: $ python scripts/fix_style.py
2020-09-26 19:41:58 +00:00
pSource->m_Falloff = NewVal;
Refactor `CEditor::PopupSource`
2023-04-01 21:19:30 +00:00
}
else if(Prop == PROP_POS_ENV)
Add support for position envelopes to sound sources
2014-10-12 13:10:33 +00:00
{
Format vector variables names (fixes #5209)
2022-06-11 19:38:18 +00:00
int Index = clamp(NewVal - 1, -1, (int)pEditor->m_Map.m_vpEnvelopes.size() - 1);
Refactor `CEditor::PopupSource`
2023-04-01 21:19:30 +00:00
const int StepDirection = Index < pSource->m_PosEnv ? -1 : 1;
for(; Index >= -1 && Index < (int)pEditor->m_Map.m_vpEnvelopes.size(); Index += StepDirection)
Add support for position envelopes to sound sources
2014-10-12 13:10:33 +00:00
{
Refactor `CEditor::PopupSource`
2023-04-01 21:19:30 +00:00
if(Index == -1 || pEditor->m_Map.m_vpEnvelopes[Index]->m_Channels == 3)
{
pSource->m_PosEnv = Index;
break;
}
Add support for position envelopes to sound sources
2014-10-12 13:10:33 +00:00
}
}
Refactor `CEditor::PopupSource`
2023-04-01 21:19:30 +00:00
else if(Prop == PROP_POS_ENV_OFFSET)
{
Run clang-format Purely automatic change. In case of conflict with this change, apply the other change and rerun the formatting to restore it: $ python scripts/fix_style.py
2020-09-26 19:41:58 +00:00
pSource->m_PosEnvOffset = NewVal;
Refactor `CEditor::PopupSource`
2023-04-01 21:19:30 +00:00
}
else if(Prop == PROP_SOUND_ENV)
Start adding a sound envelope
2014-10-11 14:05:36 +00:00
{
Format vector variables names (fixes #5209)
2022-06-11 19:38:18 +00:00
int Index = clamp(NewVal - 1, -1, (int)pEditor->m_Map.m_vpEnvelopes.size() - 1);
Refactor `CEditor::PopupSource`
2023-04-01 21:19:30 +00:00
const int StepDirection = Index < pSource->m_SoundEnv ? -1 : 1;
for(; Index >= -1 && Index < (int)pEditor->m_Map.m_vpEnvelopes.size(); Index += StepDirection)
Start adding a sound envelope
2014-10-11 14:05:36 +00:00
{
Refactor `CEditor::PopupSource`
2023-04-01 21:19:30 +00:00
if(Index == -1 || pEditor->m_Map.m_vpEnvelopes[Index]->m_Channels == 1)
{
pSource->m_SoundEnv = Index;
break;
}
Start adding a sound envelope
2014-10-11 14:05:36 +00:00
}
}
Refactor `CEditor::PopupSource`
2023-04-01 21:19:30 +00:00
else if(Prop == PROP_SOUND_ENV_OFFSET)
{
Run clang-format Purely automatic change. In case of conflict with this change, apply the other change and rerun the formatting to restore it: $ python scripts/fix_style.py
2020-09-26 19:41:58 +00:00
pSource->m_SoundEnvOffset = NewVal;
Refactor `CEditor::PopupSource`
2023-04-01 21:19:30 +00:00
}
Add editor support for editing sound source properties
2014-10-10 17:11:21 +00:00
Working on adding editor UI support for sound shapes
2014-11-28 19:25:43 +00:00
// source shape properties
switch(pSource->m_Shape.m_Type)
{
case CSoundShape::SHAPE_CIRCLE:
Run clang-format Purely automatic change. In case of conflict with this change, apply the other change and rerun the formatting to restore it: $ python scripts/fix_style.py
2020-09-26 19:41:58 +00:00
{
enum
Working on adding editor UI support for sound shapes
2014-11-28 19:25:43 +00:00
{
Run clang-format Purely automatic change. In case of conflict with this change, apply the other change and rerun the formatting to restore it: $ python scripts/fix_style.py
2020-09-26 19:41:58 +00:00
PROP_CIRCLE_RADIUS = 0,
NUM_CIRCLE_PROPS,
};
Fix whitespaces a bit
2015-07-09 00:08:14 +00:00
Run clang-format Purely automatic change. In case of conflict with this change, apply the other change and rerun the formatting to restore it: $ python scripts/fix_style.py
2020-09-26 19:41:58 +00:00
CProperty aCircleProps[] = {
{"Radius", pSource->m_Shape.m_Circle.m_Radius, PROPTYPE_INT_SCROLL, 0, 1000000},
Use nullptr in generated and editor -Wzero-as-null-pointer-constant
2022-06-13 16:28:13 +00:00
{nullptr},
Run clang-format Purely automatic change. In case of conflict with this change, apply the other change and rerun the formatting to restore it: $ python scripts/fix_style.py
2020-09-26 19:41:58 +00:00
};
Working on adding editor UI support for sound shapes
2014-11-28 19:25:43 +00:00
Run clang-format Purely automatic change. In case of conflict with this change, apply the other change and rerun the formatting to restore it: $ python scripts/fix_style.py
2020-09-26 19:41:58 +00:00
static int s_aCircleIds[NUM_CIRCLE_PROPS] = {0};
NewVal = 0;
Prop = pEditor->DoProperties(&View, aCircleProps, s_aCircleIds, &NewVal);
if(Prop != -1)
Refactor `CEditor::PopupSource`
2023-04-01 21:19:30 +00:00
{
Run clang-format Purely automatic change. In case of conflict with this change, apply the other change and rerun the formatting to restore it: $ python scripts/fix_style.py
2020-09-26 19:41:58 +00:00
pEditor->m_Map.m_Modified = true;
Refactor `CEditor::PopupSource`
2023-04-01 21:19:30 +00:00
}
Working on adding editor UI support for sound shapes
2014-11-28 19:25:43 +00:00
Run clang-format Purely automatic change. In case of conflict with this change, apply the other change and rerun the formatting to restore it: $ python scripts/fix_style.py
2020-09-26 19:41:58 +00:00
if(Prop == PROP_CIRCLE_RADIUS)
Refactor `CEditor::PopupSource`
2023-04-01 21:19:30 +00:00
{
Run clang-format Purely automatic change. In case of conflict with this change, apply the other change and rerun the formatting to restore it: $ python scripts/fix_style.py
2020-09-26 19:41:58 +00:00
pSource->m_Shape.m_Circle.m_Radius = NewVal;
Refactor `CEditor::PopupSource`
2023-04-01 21:19:30 +00:00
}
Working on adding editor UI support for sound shapes
2014-11-28 19:25:43 +00:00
Run clang-format Purely automatic change. In case of conflict with this change, apply the other change and rerun the formatting to restore it: $ python scripts/fix_style.py
2020-09-26 19:41:58 +00:00
break;
}
Fix whitespaces a bit
2015-07-09 00:08:14 +00:00
Working on adding editor UI support for sound shapes
2014-11-28 19:25:43 +00:00
case CSoundShape::SHAPE_RECTANGLE:
Run clang-format Purely automatic change. In case of conflict with this change, apply the other change and rerun the formatting to restore it: $ python scripts/fix_style.py
2020-09-26 19:41:58 +00:00
{
enum
Working on adding editor UI support for sound shapes
2014-11-28 19:25:43 +00:00
{
Run clang-format Purely automatic change. In case of conflict with this change, apply the other change and rerun the formatting to restore it: $ python scripts/fix_style.py
2020-09-26 19:41:58 +00:00
PROP_RECTANGLE_WIDTH = 0,
PROP_RECTANGLE_HEIGHT,
NUM_RECTANGLE_PROPS,
};
Fix whitespaces a bit
2015-07-09 00:08:14 +00:00
Run clang-format Purely automatic change. In case of conflict with this change, apply the other change and rerun the formatting to restore it: $ python scripts/fix_style.py
2020-09-26 19:41:58 +00:00
CProperty aRectangleProps[] = {
{"Width", pSource->m_Shape.m_Rectangle.m_Width / 1024, PROPTYPE_INT_SCROLL, 0, 1000000},
{"Height", pSource->m_Shape.m_Rectangle.m_Height / 1024, PROPTYPE_INT_SCROLL, 0, 1000000},
Use nullptr in generated and editor -Wzero-as-null-pointer-constant
2022-06-13 16:28:13 +00:00
{nullptr},
Run clang-format Purely automatic change. In case of conflict with this change, apply the other change and rerun the formatting to restore it: $ python scripts/fix_style.py
2020-09-26 19:41:58 +00:00
};
Add editor properties for rectangle shaped sources and visualize falloff distance
2014-11-29 12:20:04 +00:00
Run clang-format Purely automatic change. In case of conflict with this change, apply the other change and rerun the formatting to restore it: $ python scripts/fix_style.py
2020-09-26 19:41:58 +00:00
static int s_aRectangleIds[NUM_RECTANGLE_PROPS] = {0};
NewVal = 0;
Prop = pEditor->DoProperties(&View, aRectangleProps, s_aRectangleIds, &NewVal);
if(Prop != -1)
Refactor `CEditor::PopupSource`
2023-04-01 21:19:30 +00:00
{
Run clang-format Purely automatic change. In case of conflict with this change, apply the other change and rerun the formatting to restore it: $ python scripts/fix_style.py
2020-09-26 19:41:58 +00:00
pEditor->m_Map.m_Modified = true;
Refactor `CEditor::PopupSource`
2023-04-01 21:19:30 +00:00
}
Add editor properties for rectangle shaped sources and visualize falloff distance
2014-11-29 12:20:04 +00:00
Run clang-format Purely automatic change. In case of conflict with this change, apply the other change and rerun the formatting to restore it: $ python scripts/fix_style.py
2020-09-26 19:41:58 +00:00
if(Prop == PROP_RECTANGLE_WIDTH)
Refactor `CEditor::PopupSource`
2023-04-01 21:19:30 +00:00
{
Run clang-format Purely automatic change. In case of conflict with this change, apply the other change and rerun the formatting to restore it: $ python scripts/fix_style.py
2020-09-26 19:41:58 +00:00
pSource->m_Shape.m_Rectangle.m_Width = NewVal * 1024;
Refactor `CEditor::PopupSource`
2023-04-01 21:19:30 +00:00
}
else if(Prop == PROP_RECTANGLE_HEIGHT)
{
Run clang-format Purely automatic change. In case of conflict with this change, apply the other change and rerun the formatting to restore it: $ python scripts/fix_style.py
2020-09-26 19:41:58 +00:00
pSource->m_Shape.m_Rectangle.m_Height = NewVal * 1024;
Refactor `CEditor::PopupSource`
2023-04-01 21:19:30 +00:00
}
Add editor properties for rectangle shaped sources and visualize falloff distance
2014-11-29 12:20:04 +00:00
Run clang-format Purely automatic change. In case of conflict with this change, apply the other change and rerun the formatting to restore it: $ python scripts/fix_style.py
2020-09-26 19:41:58 +00:00
break;
}
Working on adding editor UI support for sound shapes
2014-11-28 19:25:43 +00:00
}
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
return CUI::POPUP_KEEP_OPEN;
Add editor support for editing sound source properties
2014-10-10 17:11:21 +00:00
}
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
CUI::EPopupMenuFunctionResult CEditor::PopupPoint(void *pContext, CUIRect View, bool Active)
editor update and other stuff
2008-01-17 23:09:49 +00:00
{
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
CEditor *pEditor = static_cast<CEditor *>(pContext);
More vector naming format
2022-06-15 17:34:41 +00:00
std::vector<CQuad *> vpQuads = pEditor->GetSelectedQuads();
CQuad *pCurrentQuad = vpQuads[pEditor->m_SelectedQuadIndex];
added "Whitespace and line Endings cleanup" by GreYFoX
2011-04-13 18:37:12 +00:00
editor update and other stuff
2008-01-17 23:09:49 +00:00
enum
{
Run clang-format Purely automatic change. In case of conflict with this change, apply the other change and rerun the formatting to restore it: $ python scripts/fix_style.py
2020-09-26 19:41:58 +00:00
PROP_POS_X = 0,
added quad positioning in the editor
2011-03-29 10:08:46 +00:00
PROP_POS_Y,
PROP_COLOR,
Allow editing texture UV offsets in Quad properties. Manual cherrypick of de82ad7a26d6ebb6029a6e60c619f8a310ea2ee6, original code by @cinaera
2019-03-29 11:38:21 +00:00
PROP_TEX_U,
PROP_TEX_V,
editor update and other stuff
2008-01-17 23:09:49 +00:00
NUM_PROPS,
};
added "Whitespace and line Endings cleanup" by GreYFoX
2011-04-13 18:37:12 +00:00
copied refactor to trunk
2010-05-29 07:25:38 +00:00
int Color = 0;
Run clang-format Purely automatic change. In case of conflict with this change, apply the other change and rerun the formatting to restore it: $ python scripts/fix_style.py
2020-09-26 19:41:58 +00:00
Color |= pCurrentQuad->m_aColors[pEditor->m_SelectedQuadPoint].r << 24;
Color |= pCurrentQuad->m_aColors[pEditor->m_SelectedQuadPoint].g << 16;
Color |= pCurrentQuad->m_aColors[pEditor->m_SelectedQuadPoint].b << 8;
selecting multiple quads
2018-08-13 09:11:56 +00:00
Color |= pCurrentQuad->m_aColors[pEditor->m_SelectedQuadPoint].a;
added "Whitespace and line Endings cleanup" by GreYFoX
2011-04-13 18:37:12 +00:00
Refactor `CEditor::PopupPoint`
2023-04-01 21:19:48 +00:00
const int X = fx2i(pCurrentQuad->m_aPoints[pEditor->m_SelectedQuadPoint].x);
const int Y = fx2i(pCurrentQuad->m_aPoints[pEditor->m_SelectedQuadPoint].y);
const int TextureU = fx2f(pCurrentQuad->m_aTexcoords[pEditor->m_SelectedQuadPoint].x) * 1024;
const int TextureV = fx2f(pCurrentQuad->m_aTexcoords[pEditor->m_SelectedQuadPoint].y) * 1024;
added "Whitespace and line Endings cleanup" by GreYFoX
2011-04-13 18:37:12 +00:00
copied refactor to trunk
2010-05-29 07:25:38 +00:00
CProperty aProps[] = {
Refactor `CEditor::PopupPoint`
2023-04-01 21:19:48 +00:00
{"Pos X", X, PROPTYPE_INT_SCROLL, -1000000, 1000000},
{"Pos Y", Y, PROPTYPE_INT_SCROLL, -1000000, 1000000},
Fix minimum/maximum values of editor properties The Order-property maximum value was too large, so it was temporarily (only visually) possible to go beyond the maximum. The minimum/maximum values for the Color-property were incorrect and redundant, as `PROPTYPE_COLOR` is used for RGBA color properties and not for envelope IDs.
2022-09-04 11:06:15 +00:00
{"Color", Color, PROPTYPE_COLOR, 0, 0},
Refactor `CEditor::PopupPoint`
2023-04-01 21:19:48 +00:00
{"Tex U", TextureU, PROPTYPE_INT_SCROLL, -1000000, 1000000},
{"Tex V", TextureV, PROPTYPE_INT_SCROLL, -1000000, 1000000},
Use nullptr in generated and editor -Wzero-as-null-pointer-constant
2022-06-13 16:28:13 +00:00
{nullptr},
editor update and other stuff
2008-01-17 23:09:49 +00:00
};
added "Whitespace and line Endings cleanup" by GreYFoX
2011-04-13 18:37:12 +00:00
copied refactor to trunk
2010-05-29 07:25:38 +00:00
static int s_aIds[NUM_PROPS] = {0};
int NewVal = 0;
added quad positioning in the editor
2011-03-29 10:08:46 +00:00
int Prop = pEditor->DoProperties(&View, aProps, s_aIds, &NewVal);
if(Prop != -1)
Refactor `CEditor::PopupPoint`
2023-04-01 21:19:48 +00:00
{
added quad positioning in the editor
2011-03-29 10:08:46 +00:00
pEditor->m_Map.m_Modified = true;
Refactor `CEditor::PopupPoint`
2023-04-01 21:19:48 +00:00
}
added quad positioning in the editor
2011-03-29 10:08:46 +00:00
More vector naming format
2022-06-15 17:34:41 +00:00
for(auto &pQuad : vpQuads)
editor update and other stuff
2008-01-17 23:09:49 +00:00
{
selecting multiple quads
2018-08-13 09:11:56 +00:00
if(Prop == PROP_POS_X)
{
for(int v = 0; v < 4; v++)
Style
2020-09-22 12:47:21 +00:00
if(pEditor->m_SelectedPoints & (1 << v))
Refactor `CEditor::PopupPoint`
2023-04-01 21:19:48 +00:00
pQuad->m_aPoints[v].x = i2fx(fx2i(pQuad->m_aPoints[v].x) + NewVal - X);
selecting multiple quads
2018-08-13 09:11:56 +00:00
}
Refactor `CEditor::PopupPoint`
2023-04-01 21:19:48 +00:00
else if(Prop == PROP_POS_Y)
editor update and other stuff
2008-01-17 23:09:49 +00:00
{
selecting multiple quads
2018-08-13 09:11:56 +00:00
for(int v = 0; v < 4; v++)
Style
2020-09-22 12:47:21 +00:00
if(pEditor->m_SelectedPoints & (1 << v))
Refactor `CEditor::PopupPoint`
2023-04-01 21:19:48 +00:00
pQuad->m_aPoints[v].y = i2fx(fx2i(pQuad->m_aPoints[v].y) + NewVal - Y);
selecting multiple quads
2018-08-13 09:11:56 +00:00
}
Refactor `CEditor::PopupPoint`
2023-04-01 21:19:48 +00:00
else if(Prop == PROP_COLOR)
selecting multiple quads
2018-08-13 09:11:56 +00:00
{
for(int v = 0; v < 4; v++)
editor update and other stuff
2008-01-17 23:09:49 +00:00
{
Run clang-format Purely automatic change. In case of conflict with this change, apply the other change and rerun the formatting to restore it: $ python scripts/fix_style.py
2020-09-26 19:41:58 +00:00
if(pEditor->m_SelectedPoints & (1 << v))
selecting multiple quads
2018-08-13 09:11:56 +00:00
{
Use std::vector instead of array in editor
2022-05-24 09:24:33 +00:00
pQuad->m_aColors[v].r = (NewVal >> 24) & 0xff;
pQuad->m_aColors[v].g = (NewVal >> 16) & 0xff;
pQuad->m_aColors[v].b = (NewVal >> 8) & 0xff;
pQuad->m_aColors[v].a = NewVal & 0xff;
selecting multiple quads
2018-08-13 09:11:56 +00:00
}
editor update and other stuff
2008-01-17 23:09:49 +00:00
}
}
Refactor `CEditor::PopupPoint`
2023-04-01 21:19:48 +00:00
else if(Prop == PROP_TEX_U)
Allow editing texture UV offsets in Quad properties. Manual cherrypick of de82ad7a26d6ebb6029a6e60c619f8a310ea2ee6, original code by @cinaera
2019-03-29 11:38:21 +00:00
{
for(int v = 0; v < 4; v++)
Style
2020-09-22 12:47:21 +00:00
if(pEditor->m_SelectedPoints & (1 << v))
Refactor `CEditor::PopupPoint`
2023-04-01 21:19:48 +00:00
pQuad->m_aTexcoords[v].x = f2fx(fx2f(pQuad->m_aTexcoords[v].x) + (NewVal - TextureU) / 1024.0f);
Allow editing texture UV offsets in Quad properties. Manual cherrypick of de82ad7a26d6ebb6029a6e60c619f8a310ea2ee6, original code by @cinaera
2019-03-29 11:38:21 +00:00
}
Refactor `CEditor::PopupPoint`
2023-04-01 21:19:48 +00:00
else if(Prop == PROP_TEX_V)
Allow editing texture UV offsets in Quad properties. Manual cherrypick of de82ad7a26d6ebb6029a6e60c619f8a310ea2ee6, original code by @cinaera
2019-03-29 11:38:21 +00:00
{
for(int v = 0; v < 4; v++)
Style
2020-09-22 12:47:21 +00:00
if(pEditor->m_SelectedPoints & (1 << v))
Refactor `CEditor::PopupPoint`
2023-04-01 21:19:48 +00:00
pQuad->m_aTexcoords[v].y = f2fx(fx2f(pQuad->m_aTexcoords[v].y) + (NewVal - TextureV) / 1024.0f);
Allow editing texture UV offsets in Quad properties. Manual cherrypick of de82ad7a26d6ebb6029a6e60c619f8a310ea2ee6, original code by @cinaera
2019-03-29 11:38:21 +00:00
}
editor update and other stuff
2008-01-17 23:09:49 +00:00
}
added "Whitespace and line Endings cleanup" by GreYFoX
2011-04-13 18:37:12 +00:00
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
return CUI::POPUP_KEEP_OPEN;
editor update and other stuff
2008-01-17 23:09:49 +00:00
}
Move all editor popup function definitions to `popups.cpp` Editor code for the popups should be located in `popups.cpp`.
2023-04-01 20:24:12 +00:00
static int gs_ModifyIndexDeletedIndex;
static void ModifyIndexDeleted(int *pIndex)
{
if(*pIndex == gs_ModifyIndexDeletedIndex)
*pIndex = -1;
else if(*pIndex > gs_ModifyIndexDeletedIndex)
*pIndex = *pIndex - 1;
}
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
CUI::EPopupMenuFunctionResult CEditor::PopupImage(void *pContext, CUIRect View, bool Active)
Move all editor popup function definitions to `popups.cpp` Editor code for the popups should be located in `popups.cpp`.
2023-04-01 20:24:12 +00:00
{
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
CEditor *pEditor = static_cast<CEditor *>(pContext);
Move all editor popup function definitions to `popups.cpp` Editor code for the popups should be located in `popups.cpp`.
2023-04-01 20:24:12 +00:00
static int s_ReaddButton = 0;
static int s_ReplaceButton = 0;
static int s_RemoveButton = 0;
CUIRect Slot;
View.HSplitTop(12.0f, &Slot, &View);
CEditorImage *pImg = pEditor->m_Map.m_vpImages[pEditor->m_SelectedImage];
static int s_ExternalButton = 0;
if(pImg->m_External)
{
if(pEditor->DoButton_MenuItem(&s_ExternalButton, "Embed", 0, &Slot, 0, "Embeds the image into the map file."))
{
pImg->m_External = 0;
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
return CUI::POPUP_CLOSE_CURRENT;
Move all editor popup function definitions to `popups.cpp` Editor code for the popups should be located in `popups.cpp`.
2023-04-01 20:24:12 +00:00
}
View.HSplitTop(5.0f, nullptr, &View);
View.HSplitTop(12.0f, &Slot, &View);
}
else if(pEditor->IsVanillaImage(pImg->m_aName))
{
if(pEditor->DoButton_MenuItem(&s_ExternalButton, "Make external", 0, &Slot, 0, "Removes the image from the map file."))
{
pImg->m_External = 1;
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
return CUI::POPUP_CLOSE_CURRENT;
Move all editor popup function definitions to `popups.cpp` Editor code for the popups should be located in `popups.cpp`.
2023-04-01 20:24:12 +00:00
}
View.HSplitTop(5.0f, nullptr, &View);
View.HSplitTop(12.0f, &Slot, &View);
}
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
static CUI::SSelectionPopupContext s_SelectionPopupContext;
Extend generic selection popup - Support scrolling. Limit maximum height to 40% of screen height. - Allow message to be empty. - Use `std::vector` instead of `std::set` for entries to keep the user-defined order of entries. - Add `m_SelectionIndex` in addition to `m_pSelection` to get selected item more conveniently for some use-cases. - Make entry height, entry padding, entry spacing, font size, and popup width configurable. - Allow alignment of selection popup with the top/bottom of another UI element. - Support transparent selection buttons.
2023-06-02 15:17:51 +00:00
static CScrollRegion s_SelectionPopupScrollRegion;
s_SelectionPopupContext.m_pScrollRegion = &s_SelectionPopupScrollRegion;
Move all editor popup function definitions to `popups.cpp` Editor code for the popups should be located in `popups.cpp`.
2023-04-01 20:24:12 +00:00
if(pEditor->DoButton_MenuItem(&s_ReaddButton, "Readd", 0, &Slot, 0, "Reloads the image from the mapres folder"))
{
char aFilename[IO_MAX_PATH_LENGTH];
str_format(aFilename, sizeof(aFilename), "%s.png", pImg->m_aName);
s_SelectionPopupContext.Reset();
Extend generic selection popup - Support scrolling. Limit maximum height to 40% of screen height. - Allow message to be empty. - Use `std::vector` instead of `std::set` for entries to keep the user-defined order of entries. - Add `m_SelectionIndex` in addition to `m_pSelection` to get selected item more conveniently for some use-cases. - Make entry height, entry padding, entry spacing, font size, and popup width configurable. - Allow alignment of selection popup with the top/bottom of another UI element. - Support transparent selection buttons.
2023-06-02 15:17:51 +00:00
std::set<std::string> EntriesSet;
pEditor->Storage()->FindFiles(aFilename, "mapres", IStorage::TYPE_ALL, &EntriesSet);
for(const auto &Entry : EntriesSet)
s_SelectionPopupContext.m_vEntries.push_back(Entry);
if(s_SelectionPopupContext.m_vEntries.empty())
Move all editor popup function definitions to `popups.cpp` Editor code for the popups should be located in `popups.cpp`.
2023-04-01 20:24:12 +00:00
{
pEditor->ShowFileDialogError("Error: could not find image '%s' in the mapres folder.", aFilename);
}
Extend generic selection popup - Support scrolling. Limit maximum height to 40% of screen height. - Allow message to be empty. - Use `std::vector` instead of `std::set` for entries to keep the user-defined order of entries. - Add `m_SelectionIndex` in addition to `m_pSelection` to get selected item more conveniently for some use-cases. - Make entry height, entry padding, entry spacing, font size, and popup width configurable. - Allow alignment of selection popup with the top/bottom of another UI element. - Support transparent selection buttons.
2023-06-02 15:17:51 +00:00
else if(s_SelectionPopupContext.m_vEntries.size() == 1)
Move all editor popup function definitions to `popups.cpp` Editor code for the popups should be located in `popups.cpp`.
2023-04-01 20:24:12 +00:00
{
Extend generic selection popup - Support scrolling. Limit maximum height to 40% of screen height. - Allow message to be empty. - Use `std::vector` instead of `std::set` for entries to keep the user-defined order of entries. - Add `m_SelectionIndex` in addition to `m_pSelection` to get selected item more conveniently for some use-cases. - Make entry height, entry padding, entry spacing, font size, and popup width configurable. - Allow alignment of selection popup with the top/bottom of another UI element. - Support transparent selection buttons.
2023-06-02 15:17:51 +00:00
s_SelectionPopupContext.m_pSelection = &s_SelectionPopupContext.m_vEntries.front();
Move all editor popup function definitions to `popups.cpp` Editor code for the popups should be located in `popups.cpp`.
2023-04-01 20:24:12 +00:00
}
else
{
str_copy(s_SelectionPopupContext.m_aMessage, "Select the wanted image:");
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
pEditor->UI()->ShowPopupSelection(pEditor->UI()->MouseX(), pEditor->UI()->MouseY(), &s_SelectionPopupContext);
Move all editor popup function definitions to `popups.cpp` Editor code for the popups should be located in `popups.cpp`.
2023-04-01 20:24:12 +00:00
}
}
if(s_SelectionPopupContext.m_pSelection != nullptr)
{
Refactor `CEditor::PopupImage`
2023-04-01 21:20:11 +00:00
const bool WasExternal = pImg->m_External;
Fix image/sound readding broken by error messages When an image/sound is readded, this reuses the `ReplaceImage/Sound` callback functions. The added error handling to prevent duplicate images/sounds was causing this to not work, as the image/sound being readded was already present. The implementation is separated from the callback functions and an additional parameter is added to toggle the duplicate name check. Previously this was hard to notice, as the error message popup was not shown due to the top-most popup being closed immediately. This will be fixed separately by a larger refactoring, so a popup can close itself immediately after opening another popup without closing the child popup instead. Closes #6500.
2023-04-03 13:51:08 +00:00
const bool Result = pEditor->ReplaceImage(s_SelectionPopupContext.m_pSelection->c_str(), IStorage::TYPE_ALL, false);
Move all editor popup function definitions to `popups.cpp` Editor code for the popups should be located in `popups.cpp`.
2023-04-01 20:24:12 +00:00
pImg->m_External = WasExternal;
s_SelectionPopupContext.Reset();
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
return Result ? CUI::POPUP_CLOSE_CURRENT : CUI::POPUP_KEEP_OPEN;
Move all editor popup function definitions to `popups.cpp` Editor code for the popups should be located in `popups.cpp`.
2023-04-01 20:24:12 +00:00
}
View.HSplitTop(5.0f, nullptr, &View);
View.HSplitTop(12.0f, &Slot, &View);
if(pEditor->DoButton_MenuItem(&s_ReplaceButton, "Replace", 0, &Slot, 0, "Replaces the image with a new one"))
{
Fix image/sound readding broken by error messages When an image/sound is readded, this reuses the `ReplaceImage/Sound` callback functions. The added error handling to prevent duplicate images/sounds was causing this to not work, as the image/sound being readded was already present. The implementation is separated from the callback functions and an additional parameter is added to toggle the duplicate name check. Previously this was hard to notice, as the error message popup was not shown due to the top-most popup being closed immediately. This will be fixed separately by a larger refactoring, so a popup can close itself immediately after opening another popup without closing the child popup instead. Closes #6500.
2023-04-03 13:51:08 +00:00
pEditor->InvokeFileDialog(IStorage::TYPE_ALL, FILETYPE_IMG, "Replace Image", "Replace", "mapres", "", ReplaceImageCallback, pEditor);
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
return CUI::POPUP_CLOSE_CURRENT;
Move all editor popup function definitions to `popups.cpp` Editor code for the popups should be located in `popups.cpp`.
2023-04-01 20:24:12 +00:00
}
View.HSplitTop(5.0f, nullptr, &View);
View.HSplitTop(12.0f, &Slot, &View);
if(pEditor->DoButton_MenuItem(&s_RemoveButton, "Remove", 0, &Slot, 0, "Removes the image from the map"))
{
delete pImg;
pEditor->m_Map.m_vpImages.erase(pEditor->m_Map.m_vpImages.begin() + pEditor->m_SelectedImage);
gs_ModifyIndexDeletedIndex = pEditor->m_SelectedImage;
pEditor->m_Map.ModifyImageIndex(ModifyIndexDeleted);
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
return CUI::POPUP_CLOSE_CURRENT;
Move all editor popup function definitions to `popups.cpp` Editor code for the popups should be located in `popups.cpp`.
2023-04-01 20:24:12 +00:00
}
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
return CUI::POPUP_KEEP_OPEN;
Move all editor popup function definitions to `popups.cpp` Editor code for the popups should be located in `popups.cpp`.
2023-04-01 20:24:12 +00:00
}
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
CUI::EPopupMenuFunctionResult CEditor::PopupSound(void *pContext, CUIRect View, bool Active)
Move all editor popup function definitions to `popups.cpp` Editor code for the popups should be located in `popups.cpp`.
2023-04-01 20:24:12 +00:00
{
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
CEditor *pEditor = static_cast<CEditor *>(pContext);
Move all editor popup function definitions to `popups.cpp` Editor code for the popups should be located in `popups.cpp`.
2023-04-01 20:24:12 +00:00
static int s_ReaddButton = 0;
static int s_ReplaceButton = 0;
static int s_RemoveButton = 0;
CUIRect Slot;
View.HSplitTop(12.0f, &Slot, &View);
CEditorSound *pSound = pEditor->m_Map.m_vpSounds[pEditor->m_SelectedSound];
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
static CUI::SSelectionPopupContext s_SelectionPopupContext;
Extend generic selection popup - Support scrolling. Limit maximum height to 40% of screen height. - Allow message to be empty. - Use `std::vector` instead of `std::set` for entries to keep the user-defined order of entries. - Add `m_SelectionIndex` in addition to `m_pSelection` to get selected item more conveniently for some use-cases. - Make entry height, entry padding, entry spacing, font size, and popup width configurable. - Allow alignment of selection popup with the top/bottom of another UI element. - Support transparent selection buttons.
2023-06-02 15:17:51 +00:00
static CScrollRegion s_SelectionPopupScrollRegion;
s_SelectionPopupContext.m_pScrollRegion = &s_SelectionPopupScrollRegion;
Move all editor popup function definitions to `popups.cpp` Editor code for the popups should be located in `popups.cpp`.
2023-04-01 20:24:12 +00:00
if(pEditor->DoButton_MenuItem(&s_ReaddButton, "Readd", 0, &Slot, 0, "Reloads the sound from the mapres folder"))
{
char aFilename[IO_MAX_PATH_LENGTH];
str_format(aFilename, sizeof(aFilename), "%s.opus", pSound->m_aName);
s_SelectionPopupContext.Reset();
Extend generic selection popup - Support scrolling. Limit maximum height to 40% of screen height. - Allow message to be empty. - Use `std::vector` instead of `std::set` for entries to keep the user-defined order of entries. - Add `m_SelectionIndex` in addition to `m_pSelection` to get selected item more conveniently for some use-cases. - Make entry height, entry padding, entry spacing, font size, and popup width configurable. - Allow alignment of selection popup with the top/bottom of another UI element. - Support transparent selection buttons.
2023-06-02 15:17:51 +00:00
std::set<std::string> EntriesSet;
pEditor->Storage()->FindFiles(aFilename, "mapres", IStorage::TYPE_ALL, &EntriesSet);
for(const auto &Entry : EntriesSet)
s_SelectionPopupContext.m_vEntries.push_back(Entry);
if(s_SelectionPopupContext.m_vEntries.empty())
Move all editor popup function definitions to `popups.cpp` Editor code for the popups should be located in `popups.cpp`.
2023-04-01 20:24:12 +00:00
{
pEditor->ShowFileDialogError("Error: could not find sound '%s' in the mapres folder.", aFilename);
}
Extend generic selection popup - Support scrolling. Limit maximum height to 40% of screen height. - Allow message to be empty. - Use `std::vector` instead of `std::set` for entries to keep the user-defined order of entries. - Add `m_SelectionIndex` in addition to `m_pSelection` to get selected item more conveniently for some use-cases. - Make entry height, entry padding, entry spacing, font size, and popup width configurable. - Allow alignment of selection popup with the top/bottom of another UI element. - Support transparent selection buttons.
2023-06-02 15:17:51 +00:00
else if(s_SelectionPopupContext.m_vEntries.size() == 1)
Move all editor popup function definitions to `popups.cpp` Editor code for the popups should be located in `popups.cpp`.
2023-04-01 20:24:12 +00:00
{
Extend generic selection popup - Support scrolling. Limit maximum height to 40% of screen height. - Allow message to be empty. - Use `std::vector` instead of `std::set` for entries to keep the user-defined order of entries. - Add `m_SelectionIndex` in addition to `m_pSelection` to get selected item more conveniently for some use-cases. - Make entry height, entry padding, entry spacing, font size, and popup width configurable. - Allow alignment of selection popup with the top/bottom of another UI element. - Support transparent selection buttons.
2023-06-02 15:17:51 +00:00
s_SelectionPopupContext.m_pSelection = &s_SelectionPopupContext.m_vEntries.front();
Move all editor popup function definitions to `popups.cpp` Editor code for the popups should be located in `popups.cpp`.
2023-04-01 20:24:12 +00:00
}
else
{
str_copy(s_SelectionPopupContext.m_aMessage, "Select the wanted sound:");
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
pEditor->UI()->ShowPopupSelection(pEditor->UI()->MouseX(), pEditor->UI()->MouseY(), &s_SelectionPopupContext);
Move all editor popup function definitions to `popups.cpp` Editor code for the popups should be located in `popups.cpp`.
2023-04-01 20:24:12 +00:00
}
}
if(s_SelectionPopupContext.m_pSelection != nullptr)
{
Fix image/sound readding broken by error messages When an image/sound is readded, this reuses the `ReplaceImage/Sound` callback functions. The added error handling to prevent duplicate images/sounds was causing this to not work, as the image/sound being readded was already present. The implementation is separated from the callback functions and an additional parameter is added to toggle the duplicate name check. Previously this was hard to notice, as the error message popup was not shown due to the top-most popup being closed immediately. This will be fixed separately by a larger refactoring, so a popup can close itself immediately after opening another popup without closing the child popup instead. Closes #6500.
2023-04-03 13:51:08 +00:00
const bool Result = pEditor->ReplaceSound(s_SelectionPopupContext.m_pSelection->c_str(), IStorage::TYPE_ALL, false);
Move all editor popup function definitions to `popups.cpp` Editor code for the popups should be located in `popups.cpp`.
2023-04-01 20:24:12 +00:00
s_SelectionPopupContext.Reset();
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
return Result ? CUI::POPUP_CLOSE_CURRENT : CUI::POPUP_KEEP_OPEN;
Move all editor popup function definitions to `popups.cpp` Editor code for the popups should be located in `popups.cpp`.
2023-04-01 20:24:12 +00:00
}
View.HSplitTop(5.0f, nullptr, &View);
View.HSplitTop(12.0f, &Slot, &View);
if(pEditor->DoButton_MenuItem(&s_ReplaceButton, "Replace", 0, &Slot, 0, "Replaces the sound with a new one"))
{
Fix image/sound readding broken by error messages When an image/sound is readded, this reuses the `ReplaceImage/Sound` callback functions. The added error handling to prevent duplicate images/sounds was causing this to not work, as the image/sound being readded was already present. The implementation is separated from the callback functions and an additional parameter is added to toggle the duplicate name check. Previously this was hard to notice, as the error message popup was not shown due to the top-most popup being closed immediately. This will be fixed separately by a larger refactoring, so a popup can close itself immediately after opening another popup without closing the child popup instead. Closes #6500.
2023-04-03 13:51:08 +00:00
pEditor->InvokeFileDialog(IStorage::TYPE_ALL, FILETYPE_SOUND, "Replace sound", "Replace", "mapres", "", ReplaceSoundCallback, pEditor);
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
return CUI::POPUP_CLOSE_CURRENT;
Move all editor popup function definitions to `popups.cpp` Editor code for the popups should be located in `popups.cpp`.
2023-04-01 20:24:12 +00:00
}
View.HSplitTop(5.0f, nullptr, &View);
View.HSplitTop(12.0f, &Slot, &View);
if(pEditor->DoButton_MenuItem(&s_RemoveButton, "Remove", 0, &Slot, 0, "Removes the sound from the map"))
{
delete pSound;
pEditor->m_Map.m_vpSounds.erase(pEditor->m_Map.m_vpSounds.begin() + pEditor->m_SelectedSound);
gs_ModifyIndexDeletedIndex = pEditor->m_SelectedSound;
pEditor->m_Map.ModifySoundIndex(ModifyIndexDeleted);
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
return CUI::POPUP_CLOSE_CURRENT;
Move all editor popup function definitions to `popups.cpp` Editor code for the popups should be located in `popups.cpp`.
2023-04-01 20:24:12 +00:00
}
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
return CUI::POPUP_KEEP_OPEN;
Move all editor popup function definitions to `popups.cpp` Editor code for the popups should be located in `popups.cpp`.
2023-04-01 20:24:12 +00:00
}
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
CUI::EPopupMenuFunctionResult CEditor::PopupNewFolder(void *pContext, CUIRect View, bool Active)
added a popup to create a new folder in the editor's file dialog and show an error if it fails
2011-03-20 21:53:50 +00:00
{
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
CEditor *pEditor = static_cast<CEditor *>(pContext);
Refactor `CEditor::PopupNewFolder` and improve layout Swap buttons so confirm button is on the right and cancel button is on the left consistently. Decrease empty space and popup size.
2023-04-01 11:23:52 +00:00
CUIRect Label, ButtonBar, Button;
View.Margin(10.0f, &View);
View.HSplitBottom(20.0f, &View, &ButtonBar);
added a popup to create a new folder in the editor's file dialog and show an error if it fails
2011-03-20 21:53:50 +00:00
// title
Refactor `CEditor::PopupNewFolder` and improve layout Swap buttons so confirm button is on the right and cancel button is on the left consistently. Decrease empty space and popup size.
2023-04-01 11:23:52 +00:00
View.HSplitTop(20.0f, &Label, &View);
Refactor vertical alignment in UI Add separate constants `TEXTALIGN_TOP`, `TEXTALIGN_MIDDLE` and `TEXTALIGN_BOTTOM` for vertical alignment. Add shorthand constants for all possible combinations of horizontal and vertical alignment, e.g. `TEXTALIGN_MC` for `TEXTALIGN_MIDDLE | TEXTALIGN_CENTER`. Replace usage of `SLabelProperties::m_AlignVertically` with these constants in all menu and editor code for more convenient and versatile alignment of text. Use combined horizontal-vertical alignment constants for all existing labels. Manually adjust layout for some elements which were initially misaligned with the new implementation. Refactoring: - Use `CORNER_NONE` instead of `0`. - Improve some `CUIRect` variables names and usage.
2023-04-09 19:24:06 +00:00
pEditor->UI()->DoLabel(&Label, "Create new folder", 20.0f, TEXTALIGN_MC);
Refactor `CEditor::PopupNewFolder` and improve layout Swap buttons so confirm button is on the right and cancel button is on the left consistently. Decrease empty space and popup size.
2023-04-01 11:23:52 +00:00
View.HSplitTop(10.0f, nullptr, &View);
added a popup to create a new folder in the editor's file dialog and show an error if it fails
2011-03-20 21:53:50 +00:00
Refactor `CEditor::PopupNewFolder` and improve layout Swap buttons so confirm button is on the right and cancel button is on the left consistently. Decrease empty space and popup size.
2023-04-01 11:23:52 +00:00
// folder name
View.HSplitTop(20.0f, &Label, &View);
Refactor vertical alignment in UI Add separate constants `TEXTALIGN_TOP`, `TEXTALIGN_MIDDLE` and `TEXTALIGN_BOTTOM` for vertical alignment. Add shorthand constants for all possible combinations of horizontal and vertical alignment, e.g. `TEXTALIGN_MC` for `TEXTALIGN_MIDDLE | TEXTALIGN_CENTER`. Replace usage of `SLabelProperties::m_AlignVertically` with these constants in all menu and editor code for more convenient and versatile alignment of text. Use combined horizontal-vertical alignment constants for all existing labels. Manually adjust layout for some elements which were initially misaligned with the new implementation. Refactoring: - Use `CORNER_NONE` instead of `0`. - Improve some `CUIRect` variables names and usage.
2023-04-09 19:24:06 +00:00
pEditor->UI()->DoLabel(&Label, "Name:", 10.0f, TEXTALIGN_ML);
Refactor `CEditor::PopupNewFolder` and improve layout Swap buttons so confirm button is on the right and cancel button is on the left consistently. Decrease empty space and popup size.
2023-04-01 11:23:52 +00:00
Label.VSplitLeft(50.0f, nullptr, &Button);
Button.HMargin(2.0f, &Button);
Port line input and IME support from 0.7 Port the line input (UI edit boxes, chat, console) and Input Method Editor (IME) support from upstream. Closes #4397. General ------------------------------ Fix issues with the text input. Closes #4346. Closes #4524. Word skipping (when holding Ctrl) is overhauled to be consistent with the Windows / Firefox experience that I took as reference. Improve usability by not blinking (i.e. always rendering) the caret shortly after is has been moved. UI text input ------------------------------ Fix inconsistent mouse-based left and right scrolling (closes #4347). Support smooth left and right scrolling. Chat ------------------------------ Support keyboard-based text selection of the chat input. Mouse-based selection could be support in the future when we decide to add something like an ingame UI cursor. Support smooth up and down scrolling of the chat input, removing the old hack that offsets the input string to simulate scrolling. Console ------------------------------ Also support mouse-based text selection of the command input. Only text from either the command input or the console log can be selected at the same time. This ensures that Ctrl+C will always copy the text that is currently visually selected in the console. Check for Ctrl+C input event in event handler instead of in render function, to hopefully fix the issue that copying does not work sometimes (closes #5974 until further notice). When Ctrl+C is used to copy text from the console log, the selection is cleared. This should make it more clear when text was copied from the log. Fix an issue that was preventing the console log selection from being cleared, when all log lines are selected. Remove Ctrl+A/E hotkeys that move cursor to beginning/end respectively. Ctrl+A now selectes all text like for all other inputs. Home and End keys can still be used to go the beginning and end. Remove Ctrl+U/K hotkeys that clear everything before/after the cursor respectively. Hold shift and use Home/End to select everything instead. IME support ------------------------------ Render list of IME candidates in the client on Windows, so the candidate list can also be viewed in fullscreen mode. There is no API available to retrieve a candidate list on the other operating systems. Improve composition rendering by underlining the composition text instead of putting it in square brackets. Track active input globally to properly activate and deactivate IME through the SDL functions. Closes #1030. Closes #1008. Password rendering ------------------------------ Fix rendering of passwords containing unicode. Instead of rendering one star character for each UTF-8 `char`, render on star for every unicode codepoint. Show the composition text also for passwords. Without seeing the composition text it's hard to type a password containing those characters. The candidate window exposes the composition anyway. If you don't want to expose your password this way, e.g. while streaming, you could: 1. Use a latin password and switch off the IME for the password input with the IME hotkey. 2. Blank your screen with an external program while you are streaming and entering passwords. 3. Use binds to authenticate in rcon or to set the server browser password. Refactoring ------------------------------ Move all text input logic and general rendering to `CLineInput`. A `CLineInput` is associated with a particular `char` buffer given as a pointer either in the constructor or with `SetBuffer`. The maximum byte size of the buffer must also be specified. The maximum length in unicode codepoints can also be specified separately (e.g. on upstream, name are limited by the number of unicode codepoints instead). Add `CLineInputBuffered`, which is a `CLineInput` that own a `char` buffer of a fixed size, which is specified as a template argument. As `CLineInput` does not own a buffer anymore, this reduces duplicate code for line inputs that need their own buffer. Add `CLineInputNumber` which has additional convenience functions to consider the text as an `int` or `float`, to reduce duplicate code in those cases. In the future we could also add an input filter function so that only numbers can be entered in the number input. Add `CLineInput::SetClipboardLineCallback` to handle the case that multiple lines of text are pasted into a lineinput. This reduces duplicate code, as this behavior was previously implemented separately for chat and console. The behavior is also fixed to be consistent with the console on Windows, so the first line being pasted edits the current input text and then sends it instead of being sent on its own without the existing input text. Add `CalcFontSizeAndBoundingBox` to UI to reduce duplicate code. Expose `CalcAlignedCursorPos` as static member function to reuse it for line input. Dispatch input events to UI inputs through the event handler instead of storing them in a duplicate buffer. Use `size_t` for line input cursor position, length etc. and for `str_utf8_stats`. Add `IButtonColorFunction` to UI to describe a functions that defines colors for the Default, Active and Hovered states of UI elements. Add some default button color functions. Use button color function to reduce duplicate code in scrollbar rendering. Use `vec2` instead of two `floats` to represent the mouse positions in the text renderer. Remove `CaretPosition` again, as it does not calculate the correct Y position near line breaks due to the wrapping being different when not rendering the entire string. Instead, calculate the exact caret position when rending a text container and store the caret position in the text cursor for later use. IME usage guide (Windows) ------------------------------ 1. Install the respective language and the Microsoft-IME keyboard (e.g. for Chinese, Japanese or Korean). 2. Launch the game (or a text editor to first try out the IME). Note that Windows may track the input language separately for every application. You can change this in the Windows input settings so the input language is changed globally. 2. Switch the input language using the hotkey Windows+Space or another hotkey that you configured in the Windows input settings (Alt+Shift is the default, but you should consider disabling it, to avoid accidentally changing the input language while playing). 3. Switch from Latin/English input mode to the respective asian input mode. - Chinese: Use Ctrl+Space to switch between English and Chinese input mode. You can change this hotkey in the IME's settings. - Japanese: Use Ctrl+Space to switch between Alphanumeric and Hiragana/Katakana input mode. You can change this hotkey in the IME's settings. - Korean: Use Right Alt to switch between English and Hangul input mode. You cannot change this hotkey as of yet. - Note that the input mode is also tracked per application, but there is no setting to change this behavior as far as I know, so you'll need to switch for every application separately. 4. Start typing. The underlined text is the current composition text. While a composition is active, you can only edit the composition text. Confirm the composition with Space or by selecting a candidate from the candidate list with the arrow keys. Cancel the composition with Escape or by using Backspace to delete the composition text. Note that not all languages offer a candidate list. SDL version-specific issues ------------------------------ - 2.26.5, 2.24.2, 2.0.22: IME candidates work. But there are minor bugs when moving the composition cursor. - 2.0.18, 2.0.20: IME candidates work. - 2.0.16 (our current version): IME candidates cannot be determined with Windows API. Windows tries to draw the composition window like before, so this does not work in fullscreen mode. - 2.0.8 (upstream 0.7): IME candidates work. But this SDL version is too old for us.
2023-01-03 21:28:38 +00:00
pEditor->DoEditBox(&pEditor->m_FileDialogNewFolderNameInput, &Button, 12.0f);
added a popup to create a new folder in the editor's file dialog and show an error if it fails
2011-03-20 21:53:50 +00:00
Show popups in editor when loading/saving file fails Show error message in a popup at the current mouse position when a file operation fails. Also works when pressing Ctrl+S to save. When replacing images/sounds also first check if an image/sound with that name already exists. When replacing sounds also first check whether the replacement sound could be loaded and don't replace existing sound with invalid sound on failure. Replace existing error message for "Create folder" dialog with the new mechanism. Closes #6430.
2023-03-17 10:54:40 +00:00
// button bar
Refactor `CEditor::PopupNewFolder` and improve layout Swap buttons so confirm button is on the right and cancel button is on the left consistently. Decrease empty space and popup size.
2023-04-01 11:23:52 +00:00
ButtonBar.VSplitLeft(110.0f, &Button, &ButtonBar);
static int s_CancelButton = 0;
if(pEditor->DoButton_Editor(&s_CancelButton, "Cancel", 0, &Button, 0, nullptr))
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
return CUI::POPUP_CLOSE_CURRENT;
Refactor `CEditor::PopupNewFolder` and improve layout Swap buttons so confirm button is on the right and cancel button is on the left consistently. Decrease empty space and popup size.
2023-04-01 11:23:52 +00:00
ButtonBar.VSplitRight(110.0f, &ButtonBar, &Button);
Show popups in editor when loading/saving file fails Show error message in a popup at the current mouse position when a file operation fails. Also works when pressing Ctrl+S to save. When replacing images/sounds also first check if an image/sound with that name already exists. When replacing sounds also first check whether the replacement sound could be loaded and don't replace existing sound with invalid sound on failure. Replace existing error message for "Create folder" dialog with the new mechanism. Closes #6430.
2023-03-17 10:54:40 +00:00
static int s_CreateButton = 0;
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
if(pEditor->DoButton_Editor(&s_CreateButton, "Create", 0, &Button, 0, nullptr) || (Active && pEditor->UI()->ConsumeHotkey(CUI::HOTKEY_ENTER)))
Show popups in editor when loading/saving file fails Show error message in a popup at the current mouse position when a file operation fails. Also works when pressing Ctrl+S to save. When replacing images/sounds also first check if an image/sound with that name already exists. When replacing sounds also first check whether the replacement sound could be loaded and don't replace existing sound with invalid sound on failure. Replace existing error message for "Create folder" dialog with the new mechanism. Closes #6430.
2023-03-17 10:54:40 +00:00
{
// create the folder
Port line input and IME support from 0.7 Port the line input (UI edit boxes, chat, console) and Input Method Editor (IME) support from upstream. Closes #4397. General ------------------------------ Fix issues with the text input. Closes #4346. Closes #4524. Word skipping (when holding Ctrl) is overhauled to be consistent with the Windows / Firefox experience that I took as reference. Improve usability by not blinking (i.e. always rendering) the caret shortly after is has been moved. UI text input ------------------------------ Fix inconsistent mouse-based left and right scrolling (closes #4347). Support smooth left and right scrolling. Chat ------------------------------ Support keyboard-based text selection of the chat input. Mouse-based selection could be support in the future when we decide to add something like an ingame UI cursor. Support smooth up and down scrolling of the chat input, removing the old hack that offsets the input string to simulate scrolling. Console ------------------------------ Also support mouse-based text selection of the command input. Only text from either the command input or the console log can be selected at the same time. This ensures that Ctrl+C will always copy the text that is currently visually selected in the console. Check for Ctrl+C input event in event handler instead of in render function, to hopefully fix the issue that copying does not work sometimes (closes #5974 until further notice). When Ctrl+C is used to copy text from the console log, the selection is cleared. This should make it more clear when text was copied from the log. Fix an issue that was preventing the console log selection from being cleared, when all log lines are selected. Remove Ctrl+A/E hotkeys that move cursor to beginning/end respectively. Ctrl+A now selectes all text like for all other inputs. Home and End keys can still be used to go the beginning and end. Remove Ctrl+U/K hotkeys that clear everything before/after the cursor respectively. Hold shift and use Home/End to select everything instead. IME support ------------------------------ Render list of IME candidates in the client on Windows, so the candidate list can also be viewed in fullscreen mode. There is no API available to retrieve a candidate list on the other operating systems. Improve composition rendering by underlining the composition text instead of putting it in square brackets. Track active input globally to properly activate and deactivate IME through the SDL functions. Closes #1030. Closes #1008. Password rendering ------------------------------ Fix rendering of passwords containing unicode. Instead of rendering one star character for each UTF-8 `char`, render on star for every unicode codepoint. Show the composition text also for passwords. Without seeing the composition text it's hard to type a password containing those characters. The candidate window exposes the composition anyway. If you don't want to expose your password this way, e.g. while streaming, you could: 1. Use a latin password and switch off the IME for the password input with the IME hotkey. 2. Blank your screen with an external program while you are streaming and entering passwords. 3. Use binds to authenticate in rcon or to set the server browser password. Refactoring ------------------------------ Move all text input logic and general rendering to `CLineInput`. A `CLineInput` is associated with a particular `char` buffer given as a pointer either in the constructor or with `SetBuffer`. The maximum byte size of the buffer must also be specified. The maximum length in unicode codepoints can also be specified separately (e.g. on upstream, name are limited by the number of unicode codepoints instead). Add `CLineInputBuffered`, which is a `CLineInput` that own a `char` buffer of a fixed size, which is specified as a template argument. As `CLineInput` does not own a buffer anymore, this reduces duplicate code for line inputs that need their own buffer. Add `CLineInputNumber` which has additional convenience functions to consider the text as an `int` or `float`, to reduce duplicate code in those cases. In the future we could also add an input filter function so that only numbers can be entered in the number input. Add `CLineInput::SetClipboardLineCallback` to handle the case that multiple lines of text are pasted into a lineinput. This reduces duplicate code, as this behavior was previously implemented separately for chat and console. The behavior is also fixed to be consistent with the console on Windows, so the first line being pasted edits the current input text and then sends it instead of being sent on its own without the existing input text. Add `CalcFontSizeAndBoundingBox` to UI to reduce duplicate code. Expose `CalcAlignedCursorPos` as static member function to reuse it for line input. Dispatch input events to UI inputs through the event handler instead of storing them in a duplicate buffer. Use `size_t` for line input cursor position, length etc. and for `str_utf8_stats`. Add `IButtonColorFunction` to UI to describe a functions that defines colors for the Default, Active and Hovered states of UI elements. Add some default button color functions. Use button color function to reduce duplicate code in scrollbar rendering. Use `vec2` instead of two `floats` to represent the mouse positions in the text renderer. Remove `CaretPosition` again, as it does not calculate the correct Y position near line breaks due to the wrapping being different when not rendering the entire string. Instead, calculate the exact caret position when rending a text container and store the caret position in the text cursor for later use. IME usage guide (Windows) ------------------------------ 1. Install the respective language and the Microsoft-IME keyboard (e.g. for Chinese, Japanese or Korean). 2. Launch the game (or a text editor to first try out the IME). Note that Windows may track the input language separately for every application. You can change this in the Windows input settings so the input language is changed globally. 2. Switch the input language using the hotkey Windows+Space or another hotkey that you configured in the Windows input settings (Alt+Shift is the default, but you should consider disabling it, to avoid accidentally changing the input language while playing). 3. Switch from Latin/English input mode to the respective asian input mode. - Chinese: Use Ctrl+Space to switch between English and Chinese input mode. You can change this hotkey in the IME's settings. - Japanese: Use Ctrl+Space to switch between Alphanumeric and Hiragana/Katakana input mode. You can change this hotkey in the IME's settings. - Korean: Use Right Alt to switch between English and Hangul input mode. You cannot change this hotkey as of yet. - Note that the input mode is also tracked per application, but there is no setting to change this behavior as far as I know, so you'll need to switch for every application separately. 4. Start typing. The underlined text is the current composition text. While a composition is active, you can only edit the composition text. Confirm the composition with Space or by selecting a candidate from the candidate list with the arrow keys. Cancel the composition with Escape or by using Backspace to delete the composition text. Note that not all languages offer a candidate list. SDL version-specific issues ------------------------------ - 2.26.5, 2.24.2, 2.0.22: IME candidates work. But there are minor bugs when moving the composition cursor. - 2.0.18, 2.0.20: IME candidates work. - 2.0.16 (our current version): IME candidates cannot be determined with Windows API. Windows tries to draw the composition window like before, so this does not work in fullscreen mode. - 2.0.8 (upstream 0.7): IME candidates work. But this SDL version is too old for us.
2023-01-03 21:28:38 +00:00
if(!pEditor->m_FileDialogNewFolderNameInput.IsEmpty())
added a popup to create a new folder in the editor's file dialog and show an error if it fails
2011-03-20 21:53:50 +00:00
{
Refactor `CEditor::PopupNewFolder` and improve layout Swap buttons so confirm button is on the right and cancel button is on the left consistently. Decrease empty space and popup size.
2023-04-01 11:23:52 +00:00
char aBuf[IO_MAX_PATH_LENGTH];
Port line input and IME support from 0.7 Port the line input (UI edit boxes, chat, console) and Input Method Editor (IME) support from upstream. Closes #4397. General ------------------------------ Fix issues with the text input. Closes #4346. Closes #4524. Word skipping (when holding Ctrl) is overhauled to be consistent with the Windows / Firefox experience that I took as reference. Improve usability by not blinking (i.e. always rendering) the caret shortly after is has been moved. UI text input ------------------------------ Fix inconsistent mouse-based left and right scrolling (closes #4347). Support smooth left and right scrolling. Chat ------------------------------ Support keyboard-based text selection of the chat input. Mouse-based selection could be support in the future when we decide to add something like an ingame UI cursor. Support smooth up and down scrolling of the chat input, removing the old hack that offsets the input string to simulate scrolling. Console ------------------------------ Also support mouse-based text selection of the command input. Only text from either the command input or the console log can be selected at the same time. This ensures that Ctrl+C will always copy the text that is currently visually selected in the console. Check for Ctrl+C input event in event handler instead of in render function, to hopefully fix the issue that copying does not work sometimes (closes #5974 until further notice). When Ctrl+C is used to copy text from the console log, the selection is cleared. This should make it more clear when text was copied from the log. Fix an issue that was preventing the console log selection from being cleared, when all log lines are selected. Remove Ctrl+A/E hotkeys that move cursor to beginning/end respectively. Ctrl+A now selectes all text like for all other inputs. Home and End keys can still be used to go the beginning and end. Remove Ctrl+U/K hotkeys that clear everything before/after the cursor respectively. Hold shift and use Home/End to select everything instead. IME support ------------------------------ Render list of IME candidates in the client on Windows, so the candidate list can also be viewed in fullscreen mode. There is no API available to retrieve a candidate list on the other operating systems. Improve composition rendering by underlining the composition text instead of putting it in square brackets. Track active input globally to properly activate and deactivate IME through the SDL functions. Closes #1030. Closes #1008. Password rendering ------------------------------ Fix rendering of passwords containing unicode. Instead of rendering one star character for each UTF-8 `char`, render on star for every unicode codepoint. Show the composition text also for passwords. Without seeing the composition text it's hard to type a password containing those characters. The candidate window exposes the composition anyway. If you don't want to expose your password this way, e.g. while streaming, you could: 1. Use a latin password and switch off the IME for the password input with the IME hotkey. 2. Blank your screen with an external program while you are streaming and entering passwords. 3. Use binds to authenticate in rcon or to set the server browser password. Refactoring ------------------------------ Move all text input logic and general rendering to `CLineInput`. A `CLineInput` is associated with a particular `char` buffer given as a pointer either in the constructor or with `SetBuffer`. The maximum byte size of the buffer must also be specified. The maximum length in unicode codepoints can also be specified separately (e.g. on upstream, name are limited by the number of unicode codepoints instead). Add `CLineInputBuffered`, which is a `CLineInput` that own a `char` buffer of a fixed size, which is specified as a template argument. As `CLineInput` does not own a buffer anymore, this reduces duplicate code for line inputs that need their own buffer. Add `CLineInputNumber` which has additional convenience functions to consider the text as an `int` or `float`, to reduce duplicate code in those cases. In the future we could also add an input filter function so that only numbers can be entered in the number input. Add `CLineInput::SetClipboardLineCallback` to handle the case that multiple lines of text are pasted into a lineinput. This reduces duplicate code, as this behavior was previously implemented separately for chat and console. The behavior is also fixed to be consistent with the console on Windows, so the first line being pasted edits the current input text and then sends it instead of being sent on its own without the existing input text. Add `CalcFontSizeAndBoundingBox` to UI to reduce duplicate code. Expose `CalcAlignedCursorPos` as static member function to reuse it for line input. Dispatch input events to UI inputs through the event handler instead of storing them in a duplicate buffer. Use `size_t` for line input cursor position, length etc. and for `str_utf8_stats`. Add `IButtonColorFunction` to UI to describe a functions that defines colors for the Default, Active and Hovered states of UI elements. Add some default button color functions. Use button color function to reduce duplicate code in scrollbar rendering. Use `vec2` instead of two `floats` to represent the mouse positions in the text renderer. Remove `CaretPosition` again, as it does not calculate the correct Y position near line breaks due to the wrapping being different when not rendering the entire string. Instead, calculate the exact caret position when rending a text container and store the caret position in the text cursor for later use. IME usage guide (Windows) ------------------------------ 1. Install the respective language and the Microsoft-IME keyboard (e.g. for Chinese, Japanese or Korean). 2. Launch the game (or a text editor to first try out the IME). Note that Windows may track the input language separately for every application. You can change this in the Windows input settings so the input language is changed globally. 2. Switch the input language using the hotkey Windows+Space or another hotkey that you configured in the Windows input settings (Alt+Shift is the default, but you should consider disabling it, to avoid accidentally changing the input language while playing). 3. Switch from Latin/English input mode to the respective asian input mode. - Chinese: Use Ctrl+Space to switch between English and Chinese input mode. You can change this hotkey in the IME's settings. - Japanese: Use Ctrl+Space to switch between Alphanumeric and Hiragana/Katakana input mode. You can change this hotkey in the IME's settings. - Korean: Use Right Alt to switch between English and Hangul input mode. You cannot change this hotkey as of yet. - Note that the input mode is also tracked per application, but there is no setting to change this behavior as far as I know, so you'll need to switch for every application separately. 4. Start typing. The underlined text is the current composition text. While a composition is active, you can only edit the composition text. Confirm the composition with Space or by selecting a candidate from the candidate list with the arrow keys. Cancel the composition with Escape or by using Backspace to delete the composition text. Note that not all languages offer a candidate list. SDL version-specific issues ------------------------------ - 2.26.5, 2.24.2, 2.0.22: IME candidates work. But there are minor bugs when moving the composition cursor. - 2.0.18, 2.0.20: IME candidates work. - 2.0.16 (our current version): IME candidates cannot be determined with Windows API. Windows tries to draw the composition window like before, so this does not work in fullscreen mode. - 2.0.8 (upstream 0.7): IME candidates work. But this SDL version is too old for us.
2023-01-03 21:28:38 +00:00
str_format(aBuf, sizeof(aBuf), "%s/%s", pEditor->m_pFileDialogPath, pEditor->m_FileDialogNewFolderNameInput.GetString());
Show popups in editor when loading/saving file fails Show error message in a popup at the current mouse position when a file operation fails. Also works when pressing Ctrl+S to save. When replacing images/sounds also first check if an image/sound with that name already exists. When replacing sounds also first check whether the replacement sound could be loaded and don't replace existing sound with invalid sound on failure. Replace existing error message for "Create folder" dialog with the new mechanism. Closes #6430.
2023-03-17 10:54:40 +00:00
if(pEditor->Storage()->CreateFolder(aBuf, IStorage::TYPE_SAVE))
added a popup to create a new folder in the editor's file dialog and show an error if it fails
2011-03-20 21:53:50 +00:00
{
Show popups in editor when loading/saving file fails Show error message in a popup at the current mouse position when a file operation fails. Also works when pressing Ctrl+S to save. When replacing images/sounds also first check if an image/sound with that name already exists. When replacing sounds also first check whether the replacement sound could be loaded and don't replace existing sound with invalid sound on failure. Replace existing error message for "Create folder" dialog with the new mechanism. Closes #6430.
2023-03-17 10:54:40 +00:00
pEditor->FilelistPopulate(IStorage::TYPE_SAVE);
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
return CUI::POPUP_CLOSE_CURRENT;
Show popups in editor when loading/saving file fails Show error message in a popup at the current mouse position when a file operation fails. Also works when pressing Ctrl+S to save. When replacing images/sounds also first check if an image/sound with that name already exists. When replacing sounds also first check whether the replacement sound could be loaded and don't replace existing sound with invalid sound on failure. Replace existing error message for "Create folder" dialog with the new mechanism. Closes #6430.
2023-03-17 10:54:40 +00:00
}
else
{
Use variadic arguments for `ShowFileDialogError` formatting Reduces duplicate code when calling the function. Also increase the size of the message popup message, as it was not large enough for all paths.
2023-03-19 10:14:55 +00:00
pEditor->ShowFileDialogError("Failed to create the folder '%s'.", aBuf);
added "Whitespace and line Endings cleanup" by GreYFoX
2011-04-13 18:37:12 +00:00
}
added a popup to create a new folder in the editor's file dialog and show an error if it fails
2011-03-20 21:53:50 +00:00
}
}
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
return CUI::POPUP_KEEP_OPEN;
added a popup to create a new folder in the editor's file dialog and show an error if it fails
2011-03-20 21:53:50 +00:00
}
editor update and other stuff
2008-01-17 23:09:49 +00:00
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
CUI::EPopupMenuFunctionResult CEditor::PopupMapInfo(void *pContext, CUIRect View, bool Active)
added map info
2011-07-12 21:31:39 +00:00
{
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
CEditor *pEditor = static_cast<CEditor *>(pContext);
added map info
2011-07-12 21:31:39 +00:00
CUIRect Label, ButtonBar, Button;
Refactor `CEditor::PopupMapInfo` and improve layout Swap buttons so confirm button is on the right and cancel button is on the left consistently. Decrease empty space and popup size.
2023-04-01 10:43:05 +00:00
View.Margin(10.0f, &View);
added map info
2011-07-12 21:31:39 +00:00
View.HSplitBottom(20.0f, &View, &ButtonBar);
Refactor `CEditor::PopupMapInfo` and improve layout Swap buttons so confirm button is on the right and cancel button is on the left consistently. Decrease empty space and popup size.
2023-04-01 10:43:05 +00:00
// title
View.HSplitTop(20.0f, &Label, &View);
Refactor vertical alignment in UI Add separate constants `TEXTALIGN_TOP`, `TEXTALIGN_MIDDLE` and `TEXTALIGN_BOTTOM` for vertical alignment. Add shorthand constants for all possible combinations of horizontal and vertical alignment, e.g. `TEXTALIGN_MC` for `TEXTALIGN_MIDDLE | TEXTALIGN_CENTER`. Replace usage of `SLabelProperties::m_AlignVertically` with these constants in all menu and editor code for more convenient and versatile alignment of text. Use combined horizontal-vertical alignment constants for all existing labels. Manually adjust layout for some elements which were initially misaligned with the new implementation. Refactoring: - Use `CORNER_NONE` instead of `0`. - Improve some `CUIRect` variables names and usage.
2023-04-09 19:24:06 +00:00
pEditor->UI()->DoLabel(&Label, "Map details", 20.0f, TEXTALIGN_MC);
Refactor `CEditor::PopupMapInfo` and improve layout Swap buttons so confirm button is on the right and cancel button is on the left consistently. Decrease empty space and popup size.
2023-04-01 10:43:05 +00:00
View.HSplitTop(10.0f, nullptr, &View);
added map info
2011-07-12 21:31:39 +00:00
// author box
View.HSplitTop(20.0f, &Label, &View);
Refactor vertical alignment in UI Add separate constants `TEXTALIGN_TOP`, `TEXTALIGN_MIDDLE` and `TEXTALIGN_BOTTOM` for vertical alignment. Add shorthand constants for all possible combinations of horizontal and vertical alignment, e.g. `TEXTALIGN_MC` for `TEXTALIGN_MIDDLE | TEXTALIGN_CENTER`. Replace usage of `SLabelProperties::m_AlignVertically` with these constants in all menu and editor code for more convenient and versatile alignment of text. Use combined horizontal-vertical alignment constants for all existing labels. Manually adjust layout for some elements which were initially misaligned with the new implementation. Refactoring: - Use `CORNER_NONE` instead of `0`. - Improve some `CUIRect` variables names and usage.
2023-04-09 19:24:06 +00:00
pEditor->UI()->DoLabel(&Label, "Author:", 10.0f, TEXTALIGN_ML);
Refactor `CEditor::PopupMapInfo` and improve layout Swap buttons so confirm button is on the right and cancel button is on the left consistently. Decrease empty space and popup size.
2023-04-01 10:43:05 +00:00
Label.VSplitLeft(60.0f, nullptr, &Button);
Button.HMargin(3.0f, &Button);
Port line input and IME support from 0.7 Port the line input (UI edit boxes, chat, console) and Input Method Editor (IME) support from upstream. Closes #4397. General ------------------------------ Fix issues with the text input. Closes #4346. Closes #4524. Word skipping (when holding Ctrl) is overhauled to be consistent with the Windows / Firefox experience that I took as reference. Improve usability by not blinking (i.e. always rendering) the caret shortly after is has been moved. UI text input ------------------------------ Fix inconsistent mouse-based left and right scrolling (closes #4347). Support smooth left and right scrolling. Chat ------------------------------ Support keyboard-based text selection of the chat input. Mouse-based selection could be support in the future when we decide to add something like an ingame UI cursor. Support smooth up and down scrolling of the chat input, removing the old hack that offsets the input string to simulate scrolling. Console ------------------------------ Also support mouse-based text selection of the command input. Only text from either the command input or the console log can be selected at the same time. This ensures that Ctrl+C will always copy the text that is currently visually selected in the console. Check for Ctrl+C input event in event handler instead of in render function, to hopefully fix the issue that copying does not work sometimes (closes #5974 until further notice). When Ctrl+C is used to copy text from the console log, the selection is cleared. This should make it more clear when text was copied from the log. Fix an issue that was preventing the console log selection from being cleared, when all log lines are selected. Remove Ctrl+A/E hotkeys that move cursor to beginning/end respectively. Ctrl+A now selectes all text like for all other inputs. Home and End keys can still be used to go the beginning and end. Remove Ctrl+U/K hotkeys that clear everything before/after the cursor respectively. Hold shift and use Home/End to select everything instead. IME support ------------------------------ Render list of IME candidates in the client on Windows, so the candidate list can also be viewed in fullscreen mode. There is no API available to retrieve a candidate list on the other operating systems. Improve composition rendering by underlining the composition text instead of putting it in square brackets. Track active input globally to properly activate and deactivate IME through the SDL functions. Closes #1030. Closes #1008. Password rendering ------------------------------ Fix rendering of passwords containing unicode. Instead of rendering one star character for each UTF-8 `char`, render on star for every unicode codepoint. Show the composition text also for passwords. Without seeing the composition text it's hard to type a password containing those characters. The candidate window exposes the composition anyway. If you don't want to expose your password this way, e.g. while streaming, you could: 1. Use a latin password and switch off the IME for the password input with the IME hotkey. 2. Blank your screen with an external program while you are streaming and entering passwords. 3. Use binds to authenticate in rcon or to set the server browser password. Refactoring ------------------------------ Move all text input logic and general rendering to `CLineInput`. A `CLineInput` is associated with a particular `char` buffer given as a pointer either in the constructor or with `SetBuffer`. The maximum byte size of the buffer must also be specified. The maximum length in unicode codepoints can also be specified separately (e.g. on upstream, name are limited by the number of unicode codepoints instead). Add `CLineInputBuffered`, which is a `CLineInput` that own a `char` buffer of a fixed size, which is specified as a template argument. As `CLineInput` does not own a buffer anymore, this reduces duplicate code for line inputs that need their own buffer. Add `CLineInputNumber` which has additional convenience functions to consider the text as an `int` or `float`, to reduce duplicate code in those cases. In the future we could also add an input filter function so that only numbers can be entered in the number input. Add `CLineInput::SetClipboardLineCallback` to handle the case that multiple lines of text are pasted into a lineinput. This reduces duplicate code, as this behavior was previously implemented separately for chat and console. The behavior is also fixed to be consistent with the console on Windows, so the first line being pasted edits the current input text and then sends it instead of being sent on its own without the existing input text. Add `CalcFontSizeAndBoundingBox` to UI to reduce duplicate code. Expose `CalcAlignedCursorPos` as static member function to reuse it for line input. Dispatch input events to UI inputs through the event handler instead of storing them in a duplicate buffer. Use `size_t` for line input cursor position, length etc. and for `str_utf8_stats`. Add `IButtonColorFunction` to UI to describe a functions that defines colors for the Default, Active and Hovered states of UI elements. Add some default button color functions. Use button color function to reduce duplicate code in scrollbar rendering. Use `vec2` instead of two `floats` to represent the mouse positions in the text renderer. Remove `CaretPosition` again, as it does not calculate the correct Y position near line breaks due to the wrapping being different when not rendering the entire string. Instead, calculate the exact caret position when rending a text container and store the caret position in the text cursor for later use. IME usage guide (Windows) ------------------------------ 1. Install the respective language and the Microsoft-IME keyboard (e.g. for Chinese, Japanese or Korean). 2. Launch the game (or a text editor to first try out the IME). Note that Windows may track the input language separately for every application. You can change this in the Windows input settings so the input language is changed globally. 2. Switch the input language using the hotkey Windows+Space or another hotkey that you configured in the Windows input settings (Alt+Shift is the default, but you should consider disabling it, to avoid accidentally changing the input language while playing). 3. Switch from Latin/English input mode to the respective asian input mode. - Chinese: Use Ctrl+Space to switch between English and Chinese input mode. You can change this hotkey in the IME's settings. - Japanese: Use Ctrl+Space to switch between Alphanumeric and Hiragana/Katakana input mode. You can change this hotkey in the IME's settings. - Korean: Use Right Alt to switch between English and Hangul input mode. You cannot change this hotkey as of yet. - Note that the input mode is also tracked per application, but there is no setting to change this behavior as far as I know, so you'll need to switch for every application separately. 4. Start typing. The underlined text is the current composition text. While a composition is active, you can only edit the composition text. Confirm the composition with Space or by selecting a candidate from the candidate list with the arrow keys. Cancel the composition with Escape or by using Backspace to delete the composition text. Note that not all languages offer a candidate list. SDL version-specific issues ------------------------------ - 2.26.5, 2.24.2, 2.0.22: IME candidates work. But there are minor bugs when moving the composition cursor. - 2.0.18, 2.0.20: IME candidates work. - 2.0.16 (our current version): IME candidates cannot be determined with Windows API. Windows tries to draw the composition window like before, so this does not work in fullscreen mode. - 2.0.8 (upstream 0.7): IME candidates work. But this SDL version is too old for us.
2023-01-03 21:28:38 +00:00
static CLineInput s_AuthorInput;
s_AuthorInput.SetBuffer(pEditor->m_Map.m_MapInfoTmp.m_aAuthor, sizeof(pEditor->m_Map.m_MapInfoTmp.m_aAuthor));
pEditor->DoEditBox(&s_AuthorInput, &Button, 10.0f);
added map info
2011-07-12 21:31:39 +00:00
// version box
View.HSplitTop(20.0f, &Label, &View);
Refactor vertical alignment in UI Add separate constants `TEXTALIGN_TOP`, `TEXTALIGN_MIDDLE` and `TEXTALIGN_BOTTOM` for vertical alignment. Add shorthand constants for all possible combinations of horizontal and vertical alignment, e.g. `TEXTALIGN_MC` for `TEXTALIGN_MIDDLE | TEXTALIGN_CENTER`. Replace usage of `SLabelProperties::m_AlignVertically` with these constants in all menu and editor code for more convenient and versatile alignment of text. Use combined horizontal-vertical alignment constants for all existing labels. Manually adjust layout for some elements which were initially misaligned with the new implementation. Refactoring: - Use `CORNER_NONE` instead of `0`. - Improve some `CUIRect` variables names and usage.
2023-04-09 19:24:06 +00:00
pEditor->UI()->DoLabel(&Label, "Version:", 10.0f, TEXTALIGN_ML);
Refactor `CEditor::PopupMapInfo` and improve layout Swap buttons so confirm button is on the right and cancel button is on the left consistently. Decrease empty space and popup size.
2023-04-01 10:43:05 +00:00
Label.VSplitLeft(60.0f, nullptr, &Button);
Button.HMargin(3.0f, &Button);
Port line input and IME support from 0.7 Port the line input (UI edit boxes, chat, console) and Input Method Editor (IME) support from upstream. Closes #4397. General ------------------------------ Fix issues with the text input. Closes #4346. Closes #4524. Word skipping (when holding Ctrl) is overhauled to be consistent with the Windows / Firefox experience that I took as reference. Improve usability by not blinking (i.e. always rendering) the caret shortly after is has been moved. UI text input ------------------------------ Fix inconsistent mouse-based left and right scrolling (closes #4347). Support smooth left and right scrolling. Chat ------------------------------ Support keyboard-based text selection of the chat input. Mouse-based selection could be support in the future when we decide to add something like an ingame UI cursor. Support smooth up and down scrolling of the chat input, removing the old hack that offsets the input string to simulate scrolling. Console ------------------------------ Also support mouse-based text selection of the command input. Only text from either the command input or the console log can be selected at the same time. This ensures that Ctrl+C will always copy the text that is currently visually selected in the console. Check for Ctrl+C input event in event handler instead of in render function, to hopefully fix the issue that copying does not work sometimes (closes #5974 until further notice). When Ctrl+C is used to copy text from the console log, the selection is cleared. This should make it more clear when text was copied from the log. Fix an issue that was preventing the console log selection from being cleared, when all log lines are selected. Remove Ctrl+A/E hotkeys that move cursor to beginning/end respectively. Ctrl+A now selectes all text like for all other inputs. Home and End keys can still be used to go the beginning and end. Remove Ctrl+U/K hotkeys that clear everything before/after the cursor respectively. Hold shift and use Home/End to select everything instead. IME support ------------------------------ Render list of IME candidates in the client on Windows, so the candidate list can also be viewed in fullscreen mode. There is no API available to retrieve a candidate list on the other operating systems. Improve composition rendering by underlining the composition text instead of putting it in square brackets. Track active input globally to properly activate and deactivate IME through the SDL functions. Closes #1030. Closes #1008. Password rendering ------------------------------ Fix rendering of passwords containing unicode. Instead of rendering one star character for each UTF-8 `char`, render on star for every unicode codepoint. Show the composition text also for passwords. Without seeing the composition text it's hard to type a password containing those characters. The candidate window exposes the composition anyway. If you don't want to expose your password this way, e.g. while streaming, you could: 1. Use a latin password and switch off the IME for the password input with the IME hotkey. 2. Blank your screen with an external program while you are streaming and entering passwords. 3. Use binds to authenticate in rcon or to set the server browser password. Refactoring ------------------------------ Move all text input logic and general rendering to `CLineInput`. A `CLineInput` is associated with a particular `char` buffer given as a pointer either in the constructor or with `SetBuffer`. The maximum byte size of the buffer must also be specified. The maximum length in unicode codepoints can also be specified separately (e.g. on upstream, name are limited by the number of unicode codepoints instead). Add `CLineInputBuffered`, which is a `CLineInput` that own a `char` buffer of a fixed size, which is specified as a template argument. As `CLineInput` does not own a buffer anymore, this reduces duplicate code for line inputs that need their own buffer. Add `CLineInputNumber` which has additional convenience functions to consider the text as an `int` or `float`, to reduce duplicate code in those cases. In the future we could also add an input filter function so that only numbers can be entered in the number input. Add `CLineInput::SetClipboardLineCallback` to handle the case that multiple lines of text are pasted into a lineinput. This reduces duplicate code, as this behavior was previously implemented separately for chat and console. The behavior is also fixed to be consistent with the console on Windows, so the first line being pasted edits the current input text and then sends it instead of being sent on its own without the existing input text. Add `CalcFontSizeAndBoundingBox` to UI to reduce duplicate code. Expose `CalcAlignedCursorPos` as static member function to reuse it for line input. Dispatch input events to UI inputs through the event handler instead of storing them in a duplicate buffer. Use `size_t` for line input cursor position, length etc. and for `str_utf8_stats`. Add `IButtonColorFunction` to UI to describe a functions that defines colors for the Default, Active and Hovered states of UI elements. Add some default button color functions. Use button color function to reduce duplicate code in scrollbar rendering. Use `vec2` instead of two `floats` to represent the mouse positions in the text renderer. Remove `CaretPosition` again, as it does not calculate the correct Y position near line breaks due to the wrapping being different when not rendering the entire string. Instead, calculate the exact caret position when rending a text container and store the caret position in the text cursor for later use. IME usage guide (Windows) ------------------------------ 1. Install the respective language and the Microsoft-IME keyboard (e.g. for Chinese, Japanese or Korean). 2. Launch the game (or a text editor to first try out the IME). Note that Windows may track the input language separately for every application. You can change this in the Windows input settings so the input language is changed globally. 2. Switch the input language using the hotkey Windows+Space or another hotkey that you configured in the Windows input settings (Alt+Shift is the default, but you should consider disabling it, to avoid accidentally changing the input language while playing). 3. Switch from Latin/English input mode to the respective asian input mode. - Chinese: Use Ctrl+Space to switch between English and Chinese input mode. You can change this hotkey in the IME's settings. - Japanese: Use Ctrl+Space to switch between Alphanumeric and Hiragana/Katakana input mode. You can change this hotkey in the IME's settings. - Korean: Use Right Alt to switch between English and Hangul input mode. You cannot change this hotkey as of yet. - Note that the input mode is also tracked per application, but there is no setting to change this behavior as far as I know, so you'll need to switch for every application separately. 4. Start typing. The underlined text is the current composition text. While a composition is active, you can only edit the composition text. Confirm the composition with Space or by selecting a candidate from the candidate list with the arrow keys. Cancel the composition with Escape or by using Backspace to delete the composition text. Note that not all languages offer a candidate list. SDL version-specific issues ------------------------------ - 2.26.5, 2.24.2, 2.0.22: IME candidates work. But there are minor bugs when moving the composition cursor. - 2.0.18, 2.0.20: IME candidates work. - 2.0.16 (our current version): IME candidates cannot be determined with Windows API. Windows tries to draw the composition window like before, so this does not work in fullscreen mode. - 2.0.8 (upstream 0.7): IME candidates work. But this SDL version is too old for us.
2023-01-03 21:28:38 +00:00
static CLineInput s_VersionInput;
s_VersionInput.SetBuffer(pEditor->m_Map.m_MapInfoTmp.m_aVersion, sizeof(pEditor->m_Map.m_MapInfoTmp.m_aVersion));
pEditor->DoEditBox(&s_VersionInput, &Button, 10.0f);
added map info
2011-07-12 21:31:39 +00:00
// credits box
View.HSplitTop(20.0f, &Label, &View);
Refactor vertical alignment in UI Add separate constants `TEXTALIGN_TOP`, `TEXTALIGN_MIDDLE` and `TEXTALIGN_BOTTOM` for vertical alignment. Add shorthand constants for all possible combinations of horizontal and vertical alignment, e.g. `TEXTALIGN_MC` for `TEXTALIGN_MIDDLE | TEXTALIGN_CENTER`. Replace usage of `SLabelProperties::m_AlignVertically` with these constants in all menu and editor code for more convenient and versatile alignment of text. Use combined horizontal-vertical alignment constants for all existing labels. Manually adjust layout for some elements which were initially misaligned with the new implementation. Refactoring: - Use `CORNER_NONE` instead of `0`. - Improve some `CUIRect` variables names and usage.
2023-04-09 19:24:06 +00:00
pEditor->UI()->DoLabel(&Label, "Credits:", 10.0f, TEXTALIGN_ML);
Refactor `CEditor::PopupMapInfo` and improve layout Swap buttons so confirm button is on the right and cancel button is on the left consistently. Decrease empty space and popup size.
2023-04-01 10:43:05 +00:00
Label.VSplitLeft(60.0f, nullptr, &Button);
Button.HMargin(3.0f, &Button);
Port line input and IME support from 0.7 Port the line input (UI edit boxes, chat, console) and Input Method Editor (IME) support from upstream. Closes #4397. General ------------------------------ Fix issues with the text input. Closes #4346. Closes #4524. Word skipping (when holding Ctrl) is overhauled to be consistent with the Windows / Firefox experience that I took as reference. Improve usability by not blinking (i.e. always rendering) the caret shortly after is has been moved. UI text input ------------------------------ Fix inconsistent mouse-based left and right scrolling (closes #4347). Support smooth left and right scrolling. Chat ------------------------------ Support keyboard-based text selection of the chat input. Mouse-based selection could be support in the future when we decide to add something like an ingame UI cursor. Support smooth up and down scrolling of the chat input, removing the old hack that offsets the input string to simulate scrolling. Console ------------------------------ Also support mouse-based text selection of the command input. Only text from either the command input or the console log can be selected at the same time. This ensures that Ctrl+C will always copy the text that is currently visually selected in the console. Check for Ctrl+C input event in event handler instead of in render function, to hopefully fix the issue that copying does not work sometimes (closes #5974 until further notice). When Ctrl+C is used to copy text from the console log, the selection is cleared. This should make it more clear when text was copied from the log. Fix an issue that was preventing the console log selection from being cleared, when all log lines are selected. Remove Ctrl+A/E hotkeys that move cursor to beginning/end respectively. Ctrl+A now selectes all text like for all other inputs. Home and End keys can still be used to go the beginning and end. Remove Ctrl+U/K hotkeys that clear everything before/after the cursor respectively. Hold shift and use Home/End to select everything instead. IME support ------------------------------ Render list of IME candidates in the client on Windows, so the candidate list can also be viewed in fullscreen mode. There is no API available to retrieve a candidate list on the other operating systems. Improve composition rendering by underlining the composition text instead of putting it in square brackets. Track active input globally to properly activate and deactivate IME through the SDL functions. Closes #1030. Closes #1008. Password rendering ------------------------------ Fix rendering of passwords containing unicode. Instead of rendering one star character for each UTF-8 `char`, render on star for every unicode codepoint. Show the composition text also for passwords. Without seeing the composition text it's hard to type a password containing those characters. The candidate window exposes the composition anyway. If you don't want to expose your password this way, e.g. while streaming, you could: 1. Use a latin password and switch off the IME for the password input with the IME hotkey. 2. Blank your screen with an external program while you are streaming and entering passwords. 3. Use binds to authenticate in rcon or to set the server browser password. Refactoring ------------------------------ Move all text input logic and general rendering to `CLineInput`. A `CLineInput` is associated with a particular `char` buffer given as a pointer either in the constructor or with `SetBuffer`. The maximum byte size of the buffer must also be specified. The maximum length in unicode codepoints can also be specified separately (e.g. on upstream, name are limited by the number of unicode codepoints instead). Add `CLineInputBuffered`, which is a `CLineInput` that own a `char` buffer of a fixed size, which is specified as a template argument. As `CLineInput` does not own a buffer anymore, this reduces duplicate code for line inputs that need their own buffer. Add `CLineInputNumber` which has additional convenience functions to consider the text as an `int` or `float`, to reduce duplicate code in those cases. In the future we could also add an input filter function so that only numbers can be entered in the number input. Add `CLineInput::SetClipboardLineCallback` to handle the case that multiple lines of text are pasted into a lineinput. This reduces duplicate code, as this behavior was previously implemented separately for chat and console. The behavior is also fixed to be consistent with the console on Windows, so the first line being pasted edits the current input text and then sends it instead of being sent on its own without the existing input text. Add `CalcFontSizeAndBoundingBox` to UI to reduce duplicate code. Expose `CalcAlignedCursorPos` as static member function to reuse it for line input. Dispatch input events to UI inputs through the event handler instead of storing them in a duplicate buffer. Use `size_t` for line input cursor position, length etc. and for `str_utf8_stats`. Add `IButtonColorFunction` to UI to describe a functions that defines colors for the Default, Active and Hovered states of UI elements. Add some default button color functions. Use button color function to reduce duplicate code in scrollbar rendering. Use `vec2` instead of two `floats` to represent the mouse positions in the text renderer. Remove `CaretPosition` again, as it does not calculate the correct Y position near line breaks due to the wrapping being different when not rendering the entire string. Instead, calculate the exact caret position when rending a text container and store the caret position in the text cursor for later use. IME usage guide (Windows) ------------------------------ 1. Install the respective language and the Microsoft-IME keyboard (e.g. for Chinese, Japanese or Korean). 2. Launch the game (or a text editor to first try out the IME). Note that Windows may track the input language separately for every application. You can change this in the Windows input settings so the input language is changed globally. 2. Switch the input language using the hotkey Windows+Space or another hotkey that you configured in the Windows input settings (Alt+Shift is the default, but you should consider disabling it, to avoid accidentally changing the input language while playing). 3. Switch from Latin/English input mode to the respective asian input mode. - Chinese: Use Ctrl+Space to switch between English and Chinese input mode. You can change this hotkey in the IME's settings. - Japanese: Use Ctrl+Space to switch between Alphanumeric and Hiragana/Katakana input mode. You can change this hotkey in the IME's settings. - Korean: Use Right Alt to switch between English and Hangul input mode. You cannot change this hotkey as of yet. - Note that the input mode is also tracked per application, but there is no setting to change this behavior as far as I know, so you'll need to switch for every application separately. 4. Start typing. The underlined text is the current composition text. While a composition is active, you can only edit the composition text. Confirm the composition with Space or by selecting a candidate from the candidate list with the arrow keys. Cancel the composition with Escape or by using Backspace to delete the composition text. Note that not all languages offer a candidate list. SDL version-specific issues ------------------------------ - 2.26.5, 2.24.2, 2.0.22: IME candidates work. But there are minor bugs when moving the composition cursor. - 2.0.18, 2.0.20: IME candidates work. - 2.0.16 (our current version): IME candidates cannot be determined with Windows API. Windows tries to draw the composition window like before, so this does not work in fullscreen mode. - 2.0.8 (upstream 0.7): IME candidates work. But this SDL version is too old for us.
2023-01-03 21:28:38 +00:00
static CLineInput s_CreditsInput;
s_CreditsInput.SetBuffer(pEditor->m_Map.m_MapInfoTmp.m_aCredits, sizeof(pEditor->m_Map.m_MapInfoTmp.m_aCredits));
pEditor->DoEditBox(&s_CreditsInput, &Button, 10.0f);
added map info
2011-07-12 21:31:39 +00:00
// license box
View.HSplitTop(20.0f, &Label, &View);
Refactor vertical alignment in UI Add separate constants `TEXTALIGN_TOP`, `TEXTALIGN_MIDDLE` and `TEXTALIGN_BOTTOM` for vertical alignment. Add shorthand constants for all possible combinations of horizontal and vertical alignment, e.g. `TEXTALIGN_MC` for `TEXTALIGN_MIDDLE | TEXTALIGN_CENTER`. Replace usage of `SLabelProperties::m_AlignVertically` with these constants in all menu and editor code for more convenient and versatile alignment of text. Use combined horizontal-vertical alignment constants for all existing labels. Manually adjust layout for some elements which were initially misaligned with the new implementation. Refactoring: - Use `CORNER_NONE` instead of `0`. - Improve some `CUIRect` variables names and usage.
2023-04-09 19:24:06 +00:00
pEditor->UI()->DoLabel(&Label, "License:", 10.0f, TEXTALIGN_ML);
Refactor `CEditor::PopupMapInfo` and improve layout Swap buttons so confirm button is on the right and cancel button is on the left consistently. Decrease empty space and popup size.
2023-04-01 10:43:05 +00:00
Label.VSplitLeft(60.0f, nullptr, &Button);
Button.HMargin(3.0f, &Button);
Port line input and IME support from 0.7 Port the line input (UI edit boxes, chat, console) and Input Method Editor (IME) support from upstream. Closes #4397. General ------------------------------ Fix issues with the text input. Closes #4346. Closes #4524. Word skipping (when holding Ctrl) is overhauled to be consistent with the Windows / Firefox experience that I took as reference. Improve usability by not blinking (i.e. always rendering) the caret shortly after is has been moved. UI text input ------------------------------ Fix inconsistent mouse-based left and right scrolling (closes #4347). Support smooth left and right scrolling. Chat ------------------------------ Support keyboard-based text selection of the chat input. Mouse-based selection could be support in the future when we decide to add something like an ingame UI cursor. Support smooth up and down scrolling of the chat input, removing the old hack that offsets the input string to simulate scrolling. Console ------------------------------ Also support mouse-based text selection of the command input. Only text from either the command input or the console log can be selected at the same time. This ensures that Ctrl+C will always copy the text that is currently visually selected in the console. Check for Ctrl+C input event in event handler instead of in render function, to hopefully fix the issue that copying does not work sometimes (closes #5974 until further notice). When Ctrl+C is used to copy text from the console log, the selection is cleared. This should make it more clear when text was copied from the log. Fix an issue that was preventing the console log selection from being cleared, when all log lines are selected. Remove Ctrl+A/E hotkeys that move cursor to beginning/end respectively. Ctrl+A now selectes all text like for all other inputs. Home and End keys can still be used to go the beginning and end. Remove Ctrl+U/K hotkeys that clear everything before/after the cursor respectively. Hold shift and use Home/End to select everything instead. IME support ------------------------------ Render list of IME candidates in the client on Windows, so the candidate list can also be viewed in fullscreen mode. There is no API available to retrieve a candidate list on the other operating systems. Improve composition rendering by underlining the composition text instead of putting it in square brackets. Track active input globally to properly activate and deactivate IME through the SDL functions. Closes #1030. Closes #1008. Password rendering ------------------------------ Fix rendering of passwords containing unicode. Instead of rendering one star character for each UTF-8 `char`, render on star for every unicode codepoint. Show the composition text also for passwords. Without seeing the composition text it's hard to type a password containing those characters. The candidate window exposes the composition anyway. If you don't want to expose your password this way, e.g. while streaming, you could: 1. Use a latin password and switch off the IME for the password input with the IME hotkey. 2. Blank your screen with an external program while you are streaming and entering passwords. 3. Use binds to authenticate in rcon or to set the server browser password. Refactoring ------------------------------ Move all text input logic and general rendering to `CLineInput`. A `CLineInput` is associated with a particular `char` buffer given as a pointer either in the constructor or with `SetBuffer`. The maximum byte size of the buffer must also be specified. The maximum length in unicode codepoints can also be specified separately (e.g. on upstream, name are limited by the number of unicode codepoints instead). Add `CLineInputBuffered`, which is a `CLineInput` that own a `char` buffer of a fixed size, which is specified as a template argument. As `CLineInput` does not own a buffer anymore, this reduces duplicate code for line inputs that need their own buffer. Add `CLineInputNumber` which has additional convenience functions to consider the text as an `int` or `float`, to reduce duplicate code in those cases. In the future we could also add an input filter function so that only numbers can be entered in the number input. Add `CLineInput::SetClipboardLineCallback` to handle the case that multiple lines of text are pasted into a lineinput. This reduces duplicate code, as this behavior was previously implemented separately for chat and console. The behavior is also fixed to be consistent with the console on Windows, so the first line being pasted edits the current input text and then sends it instead of being sent on its own without the existing input text. Add `CalcFontSizeAndBoundingBox` to UI to reduce duplicate code. Expose `CalcAlignedCursorPos` as static member function to reuse it for line input. Dispatch input events to UI inputs through the event handler instead of storing them in a duplicate buffer. Use `size_t` for line input cursor position, length etc. and for `str_utf8_stats`. Add `IButtonColorFunction` to UI to describe a functions that defines colors for the Default, Active and Hovered states of UI elements. Add some default button color functions. Use button color function to reduce duplicate code in scrollbar rendering. Use `vec2` instead of two `floats` to represent the mouse positions in the text renderer. Remove `CaretPosition` again, as it does not calculate the correct Y position near line breaks due to the wrapping being different when not rendering the entire string. Instead, calculate the exact caret position when rending a text container and store the caret position in the text cursor for later use. IME usage guide (Windows) ------------------------------ 1. Install the respective language and the Microsoft-IME keyboard (e.g. for Chinese, Japanese or Korean). 2. Launch the game (or a text editor to first try out the IME). Note that Windows may track the input language separately for every application. You can change this in the Windows input settings so the input language is changed globally. 2. Switch the input language using the hotkey Windows+Space or another hotkey that you configured in the Windows input settings (Alt+Shift is the default, but you should consider disabling it, to avoid accidentally changing the input language while playing). 3. Switch from Latin/English input mode to the respective asian input mode. - Chinese: Use Ctrl+Space to switch between English and Chinese input mode. You can change this hotkey in the IME's settings. - Japanese: Use Ctrl+Space to switch between Alphanumeric and Hiragana/Katakana input mode. You can change this hotkey in the IME's settings. - Korean: Use Right Alt to switch between English and Hangul input mode. You cannot change this hotkey as of yet. - Note that the input mode is also tracked per application, but there is no setting to change this behavior as far as I know, so you'll need to switch for every application separately. 4. Start typing. The underlined text is the current composition text. While a composition is active, you can only edit the composition text. Confirm the composition with Space or by selecting a candidate from the candidate list with the arrow keys. Cancel the composition with Escape or by using Backspace to delete the composition text. Note that not all languages offer a candidate list. SDL version-specific issues ------------------------------ - 2.26.5, 2.24.2, 2.0.22: IME candidates work. But there are minor bugs when moving the composition cursor. - 2.0.18, 2.0.20: IME candidates work. - 2.0.16 (our current version): IME candidates cannot be determined with Windows API. Windows tries to draw the composition window like before, so this does not work in fullscreen mode. - 2.0.8 (upstream 0.7): IME candidates work. But this SDL version is too old for us.
2023-01-03 21:28:38 +00:00
static CLineInput s_LicenseInput;
s_LicenseInput.SetBuffer(pEditor->m_Map.m_MapInfoTmp.m_aLicense, sizeof(pEditor->m_Map.m_MapInfoTmp.m_aLicense));
pEditor->DoEditBox(&s_LicenseInput, &Button, 10.0f);
added map info
2011-07-12 21:31:39 +00:00
// button bar
ButtonBar.VSplitLeft(110.0f, &Label, &ButtonBar);
Refactor `CEditor::PopupMapInfo` and improve layout Swap buttons so confirm button is on the right and cancel button is on the left consistently. Decrease empty space and popup size.
2023-04-01 10:43:05 +00:00
static int s_CancelButton = 0;
if(pEditor->DoButton_Editor(&s_CancelButton, "Cancel", 0, &Label, 0, nullptr))
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
return CUI::POPUP_CLOSE_CURRENT;
added map info
2011-07-12 21:31:39 +00:00
ButtonBar.VSplitRight(110.0f, &ButtonBar, &Label);
Refactor `CEditor::PopupMapInfo` and improve layout Swap buttons so confirm button is on the right and cancel button is on the left consistently. Decrease empty space and popup size.
2023-04-01 10:43:05 +00:00
static int s_ConfirmButton = 0;
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
if(pEditor->DoButton_Editor(&s_ConfirmButton, "Confirm", 0, &Label, 0, nullptr) || (Active && pEditor->UI()->ConsumeHotkey(CUI::HOTKEY_ENTER)))
Refactor `CEditor::PopupMapInfo` and improve layout Swap buttons so confirm button is on the right and cancel button is on the left consistently. Decrease empty space and popup size.
2023-04-01 10:43:05 +00:00
{
Refactor `CEditorMap::CMapInfo` Reduce duplicate code. Make code more similar to upstream.
2023-04-22 14:43:58 +00:00
pEditor->m_Map.m_MapInfo.Copy(pEditor->m_Map.m_MapInfoTmp);
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
return CUI::POPUP_CLOSE_CURRENT;
Refactor `CEditor::PopupMapInfo` and improve layout Swap buttons so confirm button is on the right and cancel button is on the left consistently. Decrease empty space and popup size.
2023-04-01 10:43:05 +00:00
}
added map info
2011-07-12 21:31:39 +00:00
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
return CUI::POPUP_KEEP_OPEN;
added a popup to create a new folder in the editor's file dialog and show an error if it fails
2011-03-20 21:53:50 +00:00
}
editor update and other stuff
2008-01-17 23:09:49 +00:00
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
CUI::EPopupMenuFunctionResult CEditor::PopupEvent(void *pContext, CUIRect View, bool Active)
added notification for unsaved map data and a confirmation for overwriting an existing map in the editor. Closes #115
2011-03-21 23:31:42 +00:00
{
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
CEditor *pEditor = static_cast<CEditor *>(pContext);
Refactor `CEditor::PopupEvent` and improve layout Swap buttons so confirm button is on the right and cancel button is on the left consistently. Decrease empty space and popup size. Add missing title for `POPEVENT_LOADCURRENT` (caught by the added assertion). Improve messages by adding additional empty line for existing line breaks.
2023-04-01 11:43:37 +00:00
const char *pTitle;
const char *pMessage;
added notification for unsaved map data and a confirmation for overwriting an existing map in the editor. Closes #115
2011-03-21 23:31:42 +00:00
if(pEditor->m_PopupEventType == POPEVENT_EXIT)
Refactor `CEditor::PopupEvent` and improve layout Swap buttons so confirm button is on the right and cancel button is on the left consistently. Decrease empty space and popup size. Add missing title for `POPEVENT_LOADCURRENT` (caught by the added assertion). Improve messages by adding additional empty line for existing line breaks.
2023-04-01 11:43:37 +00:00
{
pTitle = "Exit the editor";
pMessage = "The map contains unsaved data, you might want to save it before you exit the editor.\n\nContinue anyway?";
}
else if(pEditor->m_PopupEventType == POPEVENT_LOAD || pEditor->m_PopupEventType == POPEVENT_LOADCURRENT)
{
pTitle = "Load map";
pMessage = "The map contains unsaved data, you might want to save it before you load a new map.\n\nContinue anyway?";
}
added notification for unsaved map data and a confirmation for overwriting an existing map in the editor. Closes #115
2011-03-21 23:31:42 +00:00
else if(pEditor->m_PopupEventType == POPEVENT_NEW)
Refactor `CEditor::PopupEvent` and improve layout Swap buttons so confirm button is on the right and cancel button is on the left consistently. Decrease empty space and popup size. Add missing title for `POPEVENT_LOADCURRENT` (caught by the added assertion). Improve messages by adding additional empty line for existing line breaks.
2023-04-01 11:43:37 +00:00
{
pTitle = "New map";
pMessage = "The map contains unsaved data, you might want to save it before you create a new map.\n\nContinue anyway?";
}
added notification for unsaved map data and a confirmation for overwriting an existing map in the editor. Closes #115
2011-03-21 23:31:42 +00:00
else if(pEditor->m_PopupEventType == POPEVENT_SAVE)
Refactor `CEditor::PopupEvent` and improve layout Swap buttons so confirm button is on the right and cancel button is on the left consistently. Decrease empty space and popup size. Add missing title for `POPEVENT_LOADCURRENT` (caught by the added assertion). Improve messages by adding additional empty line for existing line breaks.
2023-04-01 11:43:37 +00:00
{
pTitle = "Save map";
pMessage = "The file already exists.\n\nDo you want to overwrite the map?";
}
Alert if layer size too big in editor (thanks to Lady Saavik, fixes #404)
2016-04-27 15:49:14 +00:00
else if(pEditor->m_PopupEventType == POPEVENT_LARGELAYER)
Refactor `CEditor::PopupEvent` and improve layout Swap buttons so confirm button is on the right and cancel button is on the left consistently. Decrease empty space and popup size. Add missing title for `POPEVENT_LOADCURRENT` (caught by the added assertion). Improve messages by adding additional empty line for existing line breaks.
2023-04-01 11:43:37 +00:00
{
pTitle = "Large layer";
pMessage = "You are trying to set the height or width of a layer to more than 1000 tiles. This is actually possible, but only rarely necessary. It may cause the editor to work slower and will result in a larger file size as well as higher memory usage for client and server.";
}
show button to mapper when placing unused tiles
2016-05-01 16:08:07 +00:00
else if(pEditor->m_PopupEventType == POPEVENT_PREVENTUNUSEDTILES)
Refactor `CEditor::PopupEvent` and improve layout Swap buttons so confirm button is on the right and cancel button is on the left consistently. Decrease empty space and popup size. Add missing title for `POPEVENT_LOADCURRENT` (caught by the added assertion). Improve messages by adding additional empty line for existing line breaks.
2023-04-01 11:43:37 +00:00
{
pTitle = "Unused tiles disabled";
move coloring and info to settings
2023-05-01 20:44:03 +00:00
pMessage = "Unused tiles can't be placed by default because they could get a use later and then destroy your map.\n\nActivate the 'Allow Unused' setting to be able to place every tile.";
Refactor `CEditor::PopupEvent` and improve layout Swap buttons so confirm button is on the right and cancel button is on the left consistently. Decrease empty space and popup size. Add missing title for `POPEVENT_LOADCURRENT` (caught by the added assertion). Improve messages by adding additional empty line for existing line breaks.
2023-04-01 11:43:37 +00:00
}
Add warning in editor for image widths
2020-06-20 23:14:36 +00:00
else if(pEditor->m_PopupEventType == POPEVENT_IMAGEDIV16)
Refactor `CEditor::PopupEvent` and improve layout Swap buttons so confirm button is on the right and cancel button is on the left consistently. Decrease empty space and popup size. Add missing title for `POPEVENT_LOADCURRENT` (caught by the added assertion). Improve messages by adding additional empty line for existing line breaks.
2023-04-01 11:43:37 +00:00
{
pTitle = "Image width/height";
pMessage = "The width or height of this image is not divisible by 16. This is required for images used in tile layers.";
}
Max images(for editor, clamp for client and warning for mapconvert) (fixes #2148)
2020-09-19 18:52:28 +00:00
else if(pEditor->m_PopupEventType == POPEVENT_IMAGE_MAX)
Refactor `CEditor::PopupEvent` and improve layout Swap buttons so confirm button is on the right and cancel button is on the left consistently. Decrease empty space and popup size. Add missing title for `POPEVENT_LOADCURRENT` (caught by the added assertion). Improve messages by adding additional empty line for existing line breaks.
2023-04-01 11:43:37 +00:00
{
pTitle = "Max images";
pMessage = "The client only allows a maximum of 64 images.";
}
Ask for confirmation before placing border tiles (fixes #2823)
2020-09-20 00:24:17 +00:00
else if(pEditor->m_PopupEventType == POPEVENT_PLACE_BORDER_TILES)
Refactor `CEditor::PopupEvent` and improve layout Swap buttons so confirm button is on the right and cancel button is on the left consistently. Decrease empty space and popup size. Add missing title for `POPEVENT_LOADCURRENT` (caught by the added assertion). Improve messages by adding additional empty line for existing line breaks.
2023-04-01 11:43:37 +00:00
{
pTitle = "Place border tiles";
pMessage = "This is going to overwrite any existing tiles around the edges of the layer.\n\nContinue?";
}
else
{
dbg_assert(false, "m_PopupEventType invalid");
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
return CUI::POPUP_CLOSE_CURRENT;
Refactor `CEditor::PopupEvent` and improve layout Swap buttons so confirm button is on the right and cancel button is on the left consistently. Decrease empty space and popup size. Add missing title for `POPEVENT_LOADCURRENT` (caught by the added assertion). Improve messages by adding additional empty line for existing line breaks.
2023-04-01 11:43:37 +00:00
}
added notification for unsaved map data and a confirmation for overwriting an existing map in the editor. Closes #115
2011-03-21 23:31:42 +00:00
Refactor `CEditor::PopupEvent` and improve layout Swap buttons so confirm button is on the right and cancel button is on the left consistently. Decrease empty space and popup size. Add missing title for `POPEVENT_LOADCURRENT` (caught by the added assertion). Improve messages by adding additional empty line for existing line breaks.
2023-04-01 11:43:37 +00:00
CUIRect Label, ButtonBar, Button;
View.Margin(10.0f, &View);
added "Whitespace and line Endings cleanup" by GreYFoX
2011-04-13 18:37:12 +00:00
View.HSplitBottom(20.0f, &View, &ButtonBar);
added notification for unsaved map data and a confirmation for overwriting an existing map in the editor. Closes #115
2011-03-21 23:31:42 +00:00
Refactor `CEditor::PopupEvent` and improve layout Swap buttons so confirm button is on the right and cancel button is on the left consistently. Decrease empty space and popup size. Add missing title for `POPEVENT_LOADCURRENT` (caught by the added assertion). Improve messages by adding additional empty line for existing line breaks.
2023-04-01 11:43:37 +00:00
// title
View.HSplitTop(20.0f, &Label, &View);
Refactor vertical alignment in UI Add separate constants `TEXTALIGN_TOP`, `TEXTALIGN_MIDDLE` and `TEXTALIGN_BOTTOM` for vertical alignment. Add shorthand constants for all possible combinations of horizontal and vertical alignment, e.g. `TEXTALIGN_MC` for `TEXTALIGN_MIDDLE | TEXTALIGN_CENTER`. Replace usage of `SLabelProperties::m_AlignVertically` with these constants in all menu and editor code for more convenient and versatile alignment of text. Use combined horizontal-vertical alignment constants for all existing labels. Manually adjust layout for some elements which were initially misaligned with the new implementation. Refactoring: - Use `CORNER_NONE` instead of `0`. - Improve some `CUIRect` variables names and usage.
2023-04-09 19:24:06 +00:00
pEditor->UI()->DoLabel(&Label, pTitle, 20.0f, TEXTALIGN_MC);
Refactor `CEditor::PopupEvent` and improve layout Swap buttons so confirm button is on the right and cancel button is on the left consistently. Decrease empty space and popup size. Add missing title for `POPEVENT_LOADCURRENT` (caught by the added assertion). Improve messages by adding additional empty line for existing line breaks.
2023-04-01 11:43:37 +00:00
// message
Auto font size
2022-03-11 16:34:48 +00:00
SLabelProperties Props;
Refactor vertical alignment in UI Add separate constants `TEXTALIGN_TOP`, `TEXTALIGN_MIDDLE` and `TEXTALIGN_BOTTOM` for vertical alignment. Add shorthand constants for all possible combinations of horizontal and vertical alignment, e.g. `TEXTALIGN_MC` for `TEXTALIGN_MIDDLE | TEXTALIGN_CENTER`. Replace usage of `SLabelProperties::m_AlignVertically` with these constants in all menu and editor code for more convenient and versatile alignment of text. Use combined horizontal-vertical alignment constants for all existing labels. Manually adjust layout for some elements which were initially misaligned with the new implementation. Refactoring: - Use `CORNER_NONE` instead of `0`. - Improve some `CUIRect` variables names and usage.
2023-04-09 19:24:06 +00:00
Props.m_MaxWidth = View.w;
pEditor->UI()->DoLabel(&View, pMessage, 10.0f, TEXTALIGN_ML, Props);
added notification for unsaved map data and a confirmation for overwriting an existing map in the editor. Closes #115
2011-03-21 23:31:42 +00:00
// button bar
Refactor `CEditor::PopupEvent` and improve layout Swap buttons so confirm button is on the right and cancel button is on the left consistently. Decrease empty space and popup size. Add missing title for `POPEVENT_LOADCURRENT` (caught by the added assertion). Improve messages by adding additional empty line for existing line breaks.
2023-04-01 11:43:37 +00:00
ButtonBar.VSplitLeft(110.0f, &Button, &ButtonBar);
if(pEditor->m_PopupEventType != POPEVENT_LARGELAYER && pEditor->m_PopupEventType != POPEVENT_PREVENTUNUSEDTILES && pEditor->m_PopupEventType != POPEVENT_IMAGEDIV16 && pEditor->m_PopupEventType != POPEVENT_IMAGE_MAX)
{
static int s_CancelButton = 0;
if(pEditor->DoButton_Editor(&s_CancelButton, "Cancel", 0, &Button, 0, nullptr))
{
pEditor->m_PopupEventWasActivated = false;
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
return CUI::POPUP_CLOSE_CURRENT;
Refactor `CEditor::PopupEvent` and improve layout Swap buttons so confirm button is on the right and cancel button is on the left consistently. Decrease empty space and popup size. Add missing title for `POPEVENT_LOADCURRENT` (caught by the added assertion). Improve messages by adding additional empty line for existing line breaks.
2023-04-01 11:43:37 +00:00
}
}
ButtonBar.VSplitRight(110.0f, &ButtonBar, &Button);
static int s_ConfirmButton = 0;
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
if(pEditor->DoButton_Editor(&s_ConfirmButton, "Confirm", 0, &Button, 0, nullptr) || (Active && pEditor->UI()->ConsumeHotkey(CUI::HOTKEY_ENTER)))
added notification for unsaved map data and a confirmation for overwriting an existing map in the editor. Closes #115
2011-03-21 23:31:42 +00:00
{
if(pEditor->m_PopupEventType == POPEVENT_EXIT)
Refactor `CEditor::PopupImage`
2023-04-01 21:20:11 +00:00
{
added notification for unsaved map data and a confirmation for overwriting an existing map in the editor. Closes #115
2011-03-21 23:31:42 +00:00
g_Config.m_ClEditor = 0;
Refactor `CEditor::PopupImage`
2023-04-01 21:20:11 +00:00
}
added notification for unsaved map data and a confirmation for overwriting an existing map in the editor. Closes #115
2011-03-21 23:31:42 +00:00
else if(pEditor->m_PopupEventType == POPEVENT_LOAD)
Refactor `CEditor::PopupImage`
2023-04-01 21:20:11 +00:00
{
Add more readability checks
2022-01-22 16:34:23 +00:00
pEditor->InvokeFileDialog(IStorage::TYPE_ALL, FILETYPE_MAP, "Load map", "Load", "maps", "", CEditor::CallbackOpenMap, pEditor);
Refactor `CEditor::PopupImage`
2023-04-01 21:20:11 +00:00
}
Load Current Map button added
2016-08-23 01:08:36 +00:00
else if(pEditor->m_PopupEventType == POPEVENT_LOADCURRENT)
Refactor `CEditor::PopupImage`
2023-04-01 21:20:11 +00:00
{
Load Current Map button added
2016-08-23 01:08:36 +00:00
pEditor->LoadCurrentMap();
Refactor `CEditor::PopupImage`
2023-04-01 21:20:11 +00:00
}
added notification for unsaved map data and a confirmation for overwriting an existing map in the editor. Closes #115
2011-03-21 23:31:42 +00:00
else if(pEditor->m_PopupEventType == POPEVENT_NEW)
{
pEditor->Reset();
pEditor->m_aFileName[0] = 0;
}
else if(pEditor->m_PopupEventType == POPEVENT_SAVE)
Show popups in editor when loading/saving file fails Show error message in a popup at the current mouse position when a file operation fails. Also works when pressing Ctrl+S to save. When replacing images/sounds also first check if an image/sound with that name already exists. When replacing sounds also first check whether the replacement sound could be loaded and don't replace existing sound with invalid sound on failure. Replace existing error message for "Create folder" dialog with the new mechanism. Closes #6430.
2023-03-17 10:54:40 +00:00
{
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
CallbackSaveMap(pEditor->m_aFileSaveName, IStorage::TYPE_SAVE, pEditor);
return CUI::POPUP_CLOSE_CURRENT;
Show popups in editor when loading/saving file fails Show error message in a popup at the current mouse position when a file operation fails. Also works when pressing Ctrl+S to save. When replacing images/sounds also first check if an image/sound with that name already exists. When replacing sounds also first check whether the replacement sound could be loaded and don't replace existing sound with invalid sound on failure. Replace existing error message for "Create folder" dialog with the new mechanism. Closes #6430.
2023-03-17 10:54:40 +00:00
}
Ask for confirmation before placing border tiles (fixes #2823)
2020-09-20 00:24:17 +00:00
else if(pEditor->m_PopupEventType == POPEVENT_PLACE_BORDER_TILES)
Refactor `CEditor::PopupEvent` and improve layout Swap buttons so confirm button is on the right and cancel button is on the left consistently. Decrease empty space and popup size. Add missing title for `POPEVENT_LOADCURRENT` (caught by the added assertion). Improve messages by adding additional empty line for existing line breaks.
2023-04-01 11:43:37 +00:00
{
Ask for confirmation before placing border tiles (fixes #2823)
2020-09-20 00:24:17 +00:00
pEditor->PlaceBorderTiles();
Refactor `CEditor::PopupEvent` and improve layout Swap buttons so confirm button is on the right and cancel button is on the left consistently. Decrease empty space and popup size. Add missing title for `POPEVENT_LOADCURRENT` (caught by the added assertion). Improve messages by adding additional empty line for existing line breaks.
2023-04-01 11:43:37 +00:00
}
fixed multiple popup creation in the editor. Closes #836
2011-08-13 17:22:01 +00:00
pEditor->m_PopupEventWasActivated = false;
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
return CUI::POPUP_CLOSE_CURRENT;
added notification for unsaved map data and a confirmation for overwriting an existing map in the editor. Closes #115
2011-03-21 23:31:42 +00:00
}
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
return CUI::POPUP_KEEP_OPEN;
added notification for unsaved map data and a confirmation for overwriting an existing map in the editor. Closes #115
2011-03-21 23:31:42 +00:00
}
editor update and other stuff
2008-01-17 23:09:49 +00:00
copied refactor to trunk
2010-05-29 07:25:38 +00:00
static int g_SelectImageSelected = -100;
static int g_SelectImageCurrent = -100;
editor update and other stuff
2008-01-17 23:09:49 +00:00
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
CUI::EPopupMenuFunctionResult CEditor::PopupSelectImage(void *pContext, CUIRect View, bool Active)
editor update and other stuff
2008-01-17 23:09:49 +00:00
{
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
CEditor *pEditor = static_cast<CEditor *>(pContext);
copied refactor to trunk
2010-05-29 07:25:38 +00:00
CUIRect ButtonBar, ImageView;
Refactor editor layer image selection popup using `CScrollRegion` The width of the popup and list are also slightly increased to better support images with longer names.
2022-08-13 11:59:01 +00:00
View.VSplitLeft(150.0f, &ButtonBar, &View);
copied refactor to trunk
2010-05-29 07:25:38 +00:00
View.Margin(10.0f, &ImageView);
added "Whitespace and line Endings cleanup" by GreYFoX
2011-04-13 18:37:12 +00:00
copied refactor to trunk
2010-05-29 07:25:38 +00:00
int ShowImage = g_SelectImageCurrent;
added "Whitespace and line Endings cleanup" by GreYFoX
2011-04-13 18:37:12 +00:00
Minor refactoring: homogenise code structure of selection popups
2022-09-04 21:00:51 +00:00
const float ButtonHeight = 12.0f;
const float ButtonMargin = 2.0f;
Refactor editor layer image selection popup using `CScrollRegion` The width of the popup and list are also slightly increased to better support images with longer names.
2022-08-13 11:59:01 +00:00
static CScrollRegion s_ScrollRegion;
vec2 ScrollOffset(0.0f, 0.0f);
CScrollRegionParams ScrollParams;
ScrollParams.m_ScrollbarWidth = 10.0f;
ScrollParams.m_ScrollbarMargin = 3.0f;
Minor refactoring: homogenise code structure of selection popups
2022-09-04 21:00:51 +00:00
ScrollParams.m_ScrollUnit = (ButtonHeight + ButtonMargin) * 5;
Refactor editor layer image selection popup using `CScrollRegion` The width of the popup and list are also slightly increased to better support images with longer names.
2022-08-13 11:59:01 +00:00
s_ScrollRegion.Begin(&ButtonBar, &ScrollOffset, &ScrollParams);
ButtonBar.y += ScrollOffset.y;
Editor: Show all images to choose from, no matter how many
2014-06-11 23:09:02 +00:00
Format vector variables names (fixes #5209)
2022-06-11 19:38:18 +00:00
for(int i = -1; i < (int)pEditor->m_Map.m_vpImages.size(); i++)
editor update and other stuff
2008-01-17 23:09:49 +00:00
{
copied refactor to trunk
2010-05-29 07:25:38 +00:00
CUIRect Button;
Minor refactoring: homogenise code structure of selection popups
2022-09-04 21:00:51 +00:00
ButtonBar.HSplitTop(ButtonMargin, nullptr, &ButtonBar);
ButtonBar.HSplitTop(ButtonHeight, &Button, &ButtonBar);
if(s_ScrollRegion.AddRect(Button))
editor update and other stuff
2008-01-17 23:09:49 +00:00
{
Minor refactoring: homogenise code structure of selection popups
2022-09-04 21:00:51 +00:00
if(pEditor->UI()->MouseInside(&Button))
ShowImage = i;
Fix accesses to vector with index -1 by adding static button IDs
2022-07-31 11:13:27 +00:00
static int s_NoneButton = 0;
Minor refactoring: homogenise code structure of selection popups
2022-09-04 21:00:51 +00:00
if(pEditor->DoButton_MenuItem(i == -1 ? (void *)&s_NoneButton : &pEditor->m_Map.m_vpImages[i], i == -1 ? "None" : pEditor->m_Map.m_vpImages[i]->m_aName, i == g_SelectImageCurrent, &Button))
Fix editor layer image selection not working
2022-09-08 13:30:22 +00:00
g_SelectImageSelected = i;
editor update and other stuff
2008-01-17 23:09:49 +00:00
}
}
added "Whitespace and line Endings cleanup" by GreYFoX
2011-04-13 18:37:12 +00:00
Refactor editor layer image selection popup using `CScrollRegion` The width of the popup and list are also slightly increased to better support images with longer names.
2022-08-13 11:59:01 +00:00
s_ScrollRegion.End();
Format vector variables names (fixes #5209)
2022-06-11 19:38:18 +00:00
if(ShowImage >= 0 && (size_t)ShowImage < pEditor->m_Map.m_vpImages.size())
fixed aspect ratio in the editor's image preview. Closes #784
2011-08-06 11:08:29 +00:00
{
if(ImageView.h < ImageView.w)
ImageView.w = ImageView.h;
else
ImageView.h = ImageView.w;
Format vector variables names (fixes #5209)
2022-06-11 19:38:18 +00:00
float Max = (float)(maximum(pEditor->m_Map.m_vpImages[ShowImage]->m_Width, pEditor->m_Map.m_vpImages[ShowImage]->m_Height));
ImageView.w *= pEditor->m_Map.m_vpImages[ShowImage]->m_Width / Max;
ImageView.h *= pEditor->m_Map.m_vpImages[ShowImage]->m_Height / Max;
pEditor->Graphics()->TextureSet(pEditor->m_Map.m_vpImages[ShowImage]->m_Texture);
fixed border rendering in the editor's image preview. Closes #908
2012-01-08 00:47:53 +00:00
pEditor->Graphics()->BlendNormal();
pEditor->Graphics()->WrapClamp();
pEditor->Graphics()->QuadsBegin();
IGraphics::CQuadItem QuadItem(ImageView.x, ImageView.y, ImageView.w, ImageView.h);
pEditor->Graphics()->QuadsDrawTL(&QuadItem, 1);
pEditor->Graphics()->QuadsEnd();
pEditor->Graphics()->WrapNormal();
fixed aspect ratio in the editor's image preview. Closes #784
2011-08-06 11:08:29 +00:00
}
editor update and other stuff
2008-01-17 23:09:49 +00:00
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
return CUI::POPUP_KEEP_OPEN;
editor update and other stuff
2008-01-17 23:09:49 +00:00
}
copied refactor to trunk
2010-05-29 07:25:38 +00:00
void CEditor::PopupSelectImageInvoke(int Current, float x, float y)
editor update and other stuff
2008-01-17 23:09:49 +00:00
{
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
static SPopupMenuId s_PopupSelectImageId;
copied refactor to trunk
2010-05-29 07:25:38 +00:00
g_SelectImageSelected = -100;
g_SelectImageCurrent = Current;
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
UI()->DoPopupMenu(&s_PopupSelectImageId, x, y, 450, 300, this, PopupSelectImage);
editor update and other stuff
2008-01-17 23:09:49 +00:00
}
copied refactor to trunk
2010-05-29 07:25:38 +00:00
int CEditor::PopupSelectImageResult()
editor update and other stuff
2008-01-17 23:09:49 +00:00
{
copied refactor to trunk
2010-05-29 07:25:38 +00:00
if(g_SelectImageSelected == -100)
editor update and other stuff
2008-01-17 23:09:49 +00:00
return -100;
added "Whitespace and line Endings cleanup" by GreYFoX
2011-04-13 18:37:12 +00:00
copied refactor to trunk
2010-05-29 07:25:38 +00:00
g_SelectImageCurrent = g_SelectImageSelected;
g_SelectImageSelected = -100;
return g_SelectImageCurrent;
editor update and other stuff
2008-01-17 23:09:49 +00:00
}
Add support for sound layers
2014-10-08 15:33:06 +00:00
static int g_SelectSoundSelected = -100;
static int g_SelectSoundCurrent = -100;
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
CUI::EPopupMenuFunctionResult CEditor::PopupSelectSound(void *pContext, CUIRect View, bool Active)
Add support for sound layers
2014-10-08 15:33:06 +00:00
{
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
CEditor *pEditor = static_cast<CEditor *>(pContext);
Refactor editor sound selection popup using `CScrollRegion` Decrease popup size by remove the unused empty space designated for "previewing" sounds.
2022-09-04 20:59:33 +00:00
const float ButtonHeight = 12.0f;
const float ButtonMargin = 2.0f;
Add support for sound layers
2014-10-08 15:33:06 +00:00
Refactor editor sound selection popup using `CScrollRegion` Decrease popup size by remove the unused empty space designated for "previewing" sounds.
2022-09-04 20:59:33 +00:00
static CScrollRegion s_ScrollRegion;
vec2 ScrollOffset(0.0f, 0.0f);
CScrollRegionParams ScrollParams;
ScrollParams.m_ScrollbarWidth = 10.0f;
ScrollParams.m_ScrollbarMargin = 3.0f;
ScrollParams.m_ScrollUnit = (ButtonHeight + ButtonMargin) * 5;
s_ScrollRegion.Begin(&View, &ScrollOffset, &ScrollParams);
View.y += ScrollOffset.y;
Add support for sound layers
2014-10-08 15:33:06 +00:00
Format vector variables names (fixes #5209)
2022-06-11 19:38:18 +00:00
for(int i = -1; i < (int)pEditor->m_Map.m_vpSounds.size(); i++)
Add support for sound layers
2014-10-08 15:33:06 +00:00
{
CUIRect Button;
Refactor editor sound selection popup using `CScrollRegion` Decrease popup size by remove the unused empty space designated for "previewing" sounds.
2022-09-04 20:59:33 +00:00
View.HSplitTop(ButtonMargin, nullptr, &View);
View.HSplitTop(ButtonHeight, &Button, &View);
if(s_ScrollRegion.AddRect(Button))
Add support for sound layers
2014-10-08 15:33:06 +00:00
{
Fix accesses to vector with index -1 by adding static button IDs
2022-07-31 11:13:27 +00:00
static int s_NoneButton = 0;
Refactor editor sound selection popup using `CScrollRegion` Decrease popup size by remove the unused empty space designated for "previewing" sounds.
2022-09-04 20:59:33 +00:00
if(pEditor->DoButton_MenuItem(i == -1 ? (void *)&s_NoneButton : &pEditor->m_Map.m_vpSounds[i], i == -1 ? "None" : pEditor->m_Map.m_vpSounds[i]->m_aName, i == g_SelectSoundCurrent, &Button))
Add support for sound layers
2014-10-08 15:33:06 +00:00
g_SelectSoundSelected = i;
}
}
Refactor editor sound selection popup using `CScrollRegion` Decrease popup size by remove the unused empty space designated for "previewing" sounds.
2022-09-04 20:59:33 +00:00
s_ScrollRegion.End();
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
return CUI::POPUP_KEEP_OPEN;
Add support for sound layers
2014-10-08 15:33:06 +00:00
}
void CEditor::PopupSelectSoundInvoke(int Current, float x, float y)
{
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
static SPopupMenuId s_PopupSelectSoundId;
Add support for sound layers
2014-10-08 15:33:06 +00:00
g_SelectSoundSelected = -100;
g_SelectSoundCurrent = Current;
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
UI()->DoPopupMenu(&s_PopupSelectSoundId, x, y, 150, 300, this, PopupSelectSound);
Add support for sound layers
2014-10-08 15:33:06 +00:00
}
int CEditor::PopupSelectSoundResult()
{
if(g_SelectSoundSelected == -100)
return -100;
g_SelectSoundCurrent = g_SelectSoundSelected;
g_SelectSoundSelected = -100;
return g_SelectSoundCurrent;
Fix whitespaces a bit
2015-07-09 00:08:14 +00:00
}
Add support for sound layers
2014-10-08 15:33:06 +00:00
added editor function to construct different game tiles from a layer. Closes #460
2011-02-12 18:10:45 +00:00
static int s_GametileOpSelected = -1;
editor update and other stuff
2008-01-17 23:09:49 +00:00
Refactor `CEditor::PopupSelectGametileOp`
2023-04-01 21:21:01 +00:00
static const char *s_apGametileOpButtonNames[] = {
"Air",
"Hookable",
"Death",
"Unhookable",
"Hookthrough",
"Freeze",
"Unfreeze",
"Deep Freeze",
"Deep Unfreeze",
"Blue Check-Tele",
"Red Check-Tele",
"Live Freeze",
"Live Unfreeze",
};
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
CUI::EPopupMenuFunctionResult CEditor::PopupSelectGametileOp(void *pContext, CUIRect View, bool Active)
added editor function to construct different game tiles from a layer. Closes #460
2011-02-12 18:10:45 +00:00
{
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
CEditor *pEditor = static_cast<CEditor *>(pContext);
added editor function to construct different game tiles from a layer. Closes #460
2011-02-12 18:10:45 +00:00
CUIRect Button;
Refactor `CEditor::PopupSelectGametileOp`
2023-04-01 21:21:01 +00:00
for(size_t i = 0; i < std::size(s_apGametileOpButtonNames); ++i)
added editor function to construct different game tiles from a layer. Closes #460
2011-02-12 18:10:45 +00:00
{
Use nullptr in generated and editor -Wzero-as-null-pointer-constant
2022-06-13 16:28:13 +00:00
View.HSplitTop(2.0f, nullptr, &View);
added editor function to construct different game tiles from a layer. Closes #460
2011-02-12 18:10:45 +00:00
View.HSplitTop(12.0f, &Button, &View);
Refactor `CEditor::PopupSelectGametileOp`
2023-04-01 21:21:01 +00:00
if(pEditor->DoButton_Editor(&s_apGametileOpButtonNames[i], s_apGametileOpButtonNames[i], 0, &Button, 0, nullptr))
added editor function to construct different game tiles from a layer. Closes #460
2011-02-12 18:10:45 +00:00
s_GametileOpSelected = i;
}
editor update and other stuff
2008-01-17 23:09:49 +00:00
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
return CUI::POPUP_KEEP_OPEN;
added editor function to construct different game tiles from a layer. Closes #460
2011-02-12 18:10:45 +00:00
}
editor update and other stuff
2008-01-17 23:09:49 +00:00
added editor function to construct different game tiles from a layer. Closes #460
2011-02-12 18:10:45 +00:00
void CEditor::PopupSelectGametileOpInvoke(float x, float y)
{
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
static SPopupMenuId s_PopupSelectGametileOpId;
added editor function to construct different game tiles from a layer. Closes #460
2011-02-12 18:10:45 +00:00
s_GametileOpSelected = -1;
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
UI()->DoPopupMenu(&s_PopupSelectGametileOpId, x, y, 120.0f, std::size(s_apGametileOpButtonNames) * 14.0f + 10.0f, this, PopupSelectGametileOp);
added editor function to construct different game tiles from a layer. Closes #460
2011-02-12 18:10:45 +00:00
}
editor update and other stuff
2008-01-17 23:09:49 +00:00
added editor function to construct different game tiles from a layer. Closes #460
2011-02-12 18:10:45 +00:00
int CEditor::PopupSelectGameTileOpResult()
{
if(s_GametileOpSelected < 0)
return -1;
added "Whitespace and line Endings cleanup" by GreYFoX
2011-04-13 18:37:12 +00:00
added editor function to construct different game tiles from a layer. Closes #460
2011-02-12 18:10:45 +00:00
int Result = s_GametileOpSelected;
s_GametileOpSelected = -1;
return Result;
}
editor update and other stuff
2008-01-17 23:09:49 +00:00
Save automapper config as external-typed mapitem
2018-10-08 20:44:49 +00:00
static int s_AutoMapConfigSelected = -100;
static int s_AutoMapConfigCurrent = -100;
Removed old hook through prediction as 0.5.2 servers are no longer compatible made it possible to load old maps Enumerated layers
2011-08-13 00:12:40 +00:00
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
CUI::EPopupMenuFunctionResult CEditor::PopupSelectConfigAutoMap(void *pContext, CUIRect View, bool Active)
Removed old hook through prediction as 0.5.2 servers are no longer compatible made it possible to load old maps Enumerated layers
2011-08-13 00:12:40 +00:00
{
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
CEditor *pEditor = static_cast<CEditor *>(pContext);
fix style
2020-09-20 12:05:39 +00:00
CLayerTiles *pLayer = static_cast<CLayerTiles *>(pEditor->GetSelectedLayer(0));
Format vector variables names (fixes #5209)
2022-06-11 19:38:18 +00:00
CAutoMapper *pAutoMapper = &pEditor->m_Map.m_vpImages[pLayer->m_Image]->m_AutoMapper;
General whitespace and tab cleanup
2011-08-11 08:59:14 +00:00
add scrollbar to auto rules list, fixes #2514
2020-09-20 11:52:38 +00:00
const float ButtonHeight = 12.0f;
fix auto rules scrollbar bugs
2020-09-27 15:20:41 +00:00
const float ButtonMargin = 2.0f;
add scrollbar to auto rules list, fixes #2514
2020-09-20 11:52:38 +00:00
Refactor editor automapper config list using `CScrollRegion` - Fix the currently selected item not being highlighted after opening the dialog. - Remove static limit of 255 automapper rules, after which the editor previously caused out-of-bounds accesses, by using the address of the automapper config name as button ID.
2022-09-03 13:43:07 +00:00
static CScrollRegion s_ScrollRegion;
vec2 ScrollOffset(0.0f, 0.0f);
CScrollRegionParams ScrollParams;
ScrollParams.m_ScrollbarWidth = 10.0f;
ScrollParams.m_ScrollbarMargin = 3.0f;
ScrollParams.m_ScrollUnit = (ButtonHeight + ButtonMargin) * 5;
s_ScrollRegion.Begin(&View, &ScrollOffset, &ScrollParams);
View.y += ScrollOffset.y;
add scrollbar to auto rules list, fixes #2514
2020-09-20 11:52:38 +00:00
Refactor editor automapper config list using `CScrollRegion` - Fix the currently selected item not being highlighted after opening the dialog. - Remove static limit of 255 automapper rules, after which the editor previously caused out-of-bounds accesses, by using the address of the automapper config name as button ID.
2022-09-03 13:43:07 +00:00
for(int i = -1; i < pAutoMapper->ConfigNamesNum(); i++)
Removed old hook through prediction as 0.5.2 servers are no longer compatible made it possible to load old maps Enumerated layers
2011-08-13 00:12:40 +00:00
{
Refactor editor automapper config list using `CScrollRegion` - Fix the currently selected item not being highlighted after opening the dialog. - Remove static limit of 255 automapper rules, after which the editor previously caused out-of-bounds accesses, by using the address of the automapper config name as button ID.
2022-09-03 13:43:07 +00:00
CUIRect Button;
View.HSplitTop(ButtonMargin, nullptr, &View);
View.HSplitTop(ButtonHeight, &Button, &View);
if(s_ScrollRegion.AddRect(Button))
add scrollbar to auto rules list, fixes #2514
2020-09-20 11:52:38 +00:00
{
Refactor editor automapper config list using `CScrollRegion` - Fix the currently selected item not being highlighted after opening the dialog. - Remove static limit of 255 automapper rules, after which the editor previously caused out-of-bounds accesses, by using the address of the automapper config name as button ID.
2022-09-03 13:43:07 +00:00
static int s_NoneButton = 0;
Minor refactoring: homogenise code structure of selection popups
2022-09-04 21:00:51 +00:00
if(pEditor->DoButton_MenuItem(i == -1 ? (void *)&s_NoneButton : pAutoMapper->GetConfigName(i), i == -1 ? "None" : pAutoMapper->GetConfigName(i), i == s_AutoMapConfigCurrent, &Button))
add scrollbar to auto rules list, fixes #2514
2020-09-20 11:52:38 +00:00
s_AutoMapConfigSelected = i;
}
Removed old hook through prediction as 0.5.2 servers are no longer compatible made it possible to load old maps Enumerated layers
2011-08-13 00:12:40 +00:00
}
Refactor editor automapper config list using `CScrollRegion` - Fix the currently selected item not being highlighted after opening the dialog. - Remove static limit of 255 automapper rules, after which the editor previously caused out-of-bounds accesses, by using the address of the automapper config name as button ID.
2022-09-03 13:43:07 +00:00
s_ScrollRegion.End();
add scrollbar to auto rules list, fixes #2514
2020-09-20 11:52:38 +00:00
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
return CUI::POPUP_KEEP_OPEN;
Removed old hook through prediction as 0.5.2 servers are no longer compatible made it possible to load old maps Enumerated layers
2011-08-13 00:12:40 +00:00
}
Add option to automatically run the automapper Also, put automapping config selection seperatelly from the automapper button. Also, add seed parameter to the automapper.
2018-10-03 16:16:58 +00:00
void CEditor::PopupSelectConfigAutoMapInvoke(int Current, float x, float y)
Removed old hook through prediction as 0.5.2 servers are no longer compatible made it possible to load old maps Enumerated layers
2011-08-13 00:12:40 +00:00
{
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
static SPopupMenuId s_PopupSelectConfigAutoMapId;
Add option to automatically run the automapper Also, put automapping config selection seperatelly from the automapper button. Also, add seed parameter to the automapper.
2018-10-03 16:16:58 +00:00
s_AutoMapConfigSelected = -100;
s_AutoMapConfigCurrent = Current;
fix style
2020-09-20 12:05:39 +00:00
CLayerTiles *pLayer = static_cast<CLayerTiles *>(GetSelectedLayer(0));
Refactor editor automapper config list using `CScrollRegion` - Fix the currently selected item not being highlighted after opening the dialog. - Remove static limit of 255 automapper rules, after which the editor previously caused out-of-bounds accesses, by using the address of the automapper config name as button ID.
2022-09-03 13:43:07 +00:00
const int ItemCount = minimum(m_Map.m_vpImages[pLayer->m_Image]->m_AutoMapper.ConfigNamesNum(), 10);
add scrollbar to auto rules list, fixes #2514
2020-09-20 11:52:38 +00:00
// Width for buttons is 120, 15 is the scrollbar width, 2 is the margin between both.
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
UI()->DoPopupMenu(&s_PopupSelectConfigAutoMapId, x, y, 120.0f + 15.0f + 2.0f, 26.0f + 14.0f * ItemCount, this, PopupSelectConfigAutoMap);
Removed old hook through prediction as 0.5.2 servers are no longer compatible made it possible to load old maps Enumerated layers
2011-08-13 00:12:40 +00:00
}
int CEditor::PopupSelectConfigAutoMapResult()
{
Add option to automatically run the automapper Also, put automapping config selection seperatelly from the automapper button. Also, add seed parameter to the automapper.
2018-10-03 16:16:58 +00:00
if(s_AutoMapConfigSelected == -100)
return -100;
General whitespace and tab cleanup
2011-08-11 08:59:14 +00:00
Add option to automatically run the automapper Also, put automapping config selection seperatelly from the automapper button. Also, add seed parameter to the automapper.
2018-10-03 16:16:58 +00:00
s_AutoMapConfigCurrent = s_AutoMapConfigSelected;
s_AutoMapConfigSelected = -100;
Refactor editor automapper config list using `CScrollRegion` - Fix the currently selected item not being highlighted after opening the dialog. - Remove static limit of 255 automapper rules, after which the editor previously caused out-of-bounds accesses, by using the address of the automapper config name as button ID.
2022-09-03 13:43:07 +00:00
return s_AutoMapConfigCurrent;
Removed old hook through prediction as 0.5.2 servers are no longer compatible made it possible to load old maps Enumerated layers
2011-08-13 00:12:40 +00:00
}
Merged Oy, Cleaned up, removed some useless features and code parts Added Icon by landil alot more...
2011-04-09 06:41:31 +00:00
// DDRace
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
CUI::EPopupMenuFunctionResult CEditor::PopupTele(void *pContext, CUIRect View, bool Active)
Added tele, speedup, front and switch layer to the client Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-30 21:31:19 +00:00
{
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
CEditor *pEditor = static_cast<CEditor *>(pContext);
fix more format failures
2020-05-20 18:57:19 +00:00
static int s_PreviousNumber = -1;
fix some tele number picker issues
2020-05-15 22:42:11 +00:00
add switch empty slot finder button
2020-05-17 00:56:35 +00:00
CUIRect NumberPicker;
fix some tele number picker issues
2020-05-15 22:42:11 +00:00
CUIRect FindEmptySlot;
add switch empty slot finder button
2020-05-17 00:56:35 +00:00
View.VSplitRight(15.f, &NumberPicker, &FindEmptySlot);
Use nullptr in generated and editor -Wzero-as-null-pointer-constant
2022-06-13 16:28:13 +00:00
NumberPicker.VSplitRight(2.f, &NumberPicker, nullptr);
Remove redundant CUIRects, improve find button height Some of the CUIRects were calculated but never used. The height of the "Find empty slot" button is made consistent with the height of the properties shifters.
2022-11-01 21:29:12 +00:00
FindEmptySlot.HSplitTop(13.0f, &FindEmptySlot, nullptr);
FindEmptySlot.HMargin(1.0f, &FindEmptySlot);
fix some tele number picker issues
2020-05-15 22:42:11 +00:00
add switch empty slot finder button
2020-05-17 00:56:35 +00:00
// find empty number button
Use fixed point conversion consistently
2020-09-22 12:28:14 +00:00
{
follow naming convention
2020-05-19 16:17:02 +00:00
static int s_EmptySlotPid = 0;
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
if(pEditor->DoButton_Editor(&s_EmptySlotPid, "F", 0, &FindEmptySlot, 0, "[ctrl+f] Find empty slot") || (Active && pEditor->Input()->ModifierIsPressed() && pEditor->Input()->KeyPress(KEY_F)))
fix some tele number picker issues
2020-05-15 22:42:11 +00:00
{
add switch empty slot finder button
2020-05-17 00:56:35 +00:00
int number = -1;
for(int i = 1; i <= 255; i++)
fix some tele number picker issues
2020-05-15 22:42:11 +00:00
{
add switch empty slot finder button
2020-05-17 00:56:35 +00:00
if(!pEditor->m_Map.m_pTeleLayer->ContainsElementWithId(i))
{
number = i;
break;
}
fix some tele number picker issues
2020-05-15 22:42:11 +00:00
}
add switch empty slot finder button
2020-05-17 00:56:35 +00:00
if(number != -1)
{
pEditor->m_TeleNumber = number;
}
fix some tele number picker issues
2020-05-15 22:42:11 +00:00
}
}
Merged Oy, Cleaned up, removed some useless features and code parts Added Icon by landil alot more...
2011-04-09 06:41:31 +00:00
add switch empty slot finder button
2020-05-17 00:56:35 +00:00
// number picker
Added tele, speedup, front and switch layer to the client Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-30 21:31:19 +00:00
{
follow naming convention
2020-05-19 16:17:02 +00:00
static ColorRGBA s_Color = ColorRGBA(0.5f, 1, 0.5f, 0.5f);
editor update and other stuff
2008-01-17 23:09:49 +00:00
add switch empty slot finder button
2020-05-17 00:56:35 +00:00
enum
{
PROP_TELE = 0,
NUM_PROPS,
};
CProperty aProps[] = {
{"Number", pEditor->m_TeleNumber, PROPTYPE_INT_STEP, 1, 255},
Use nullptr in generated and editor -Wzero-as-null-pointer-constant
2022-06-13 16:28:13 +00:00
{nullptr},
add switch empty slot finder button
2020-05-17 00:56:35 +00:00
};
Use fixed point conversion consistently
2020-09-22 12:28:14 +00:00
add switch empty slot finder button
2020-05-17 00:56:35 +00:00
static int s_aIds[NUM_PROPS] = {0};
static int NewVal = 0;
follow naming convention
2020-05-19 16:17:02 +00:00
int Prop = pEditor->DoProperties(&NumberPicker, aProps, s_aIds, &NewVal, s_Color);
add switch empty slot finder button
2020-05-17 00:56:35 +00:00
if(Prop == PROP_TELE)
{
Fix incorrect minimum values for tele, speedup and switch layers It was possible to select tele number 0, speedup force 0 and switch number 0 in the layer details in the editor, because some of the bounds checks or calculations were not excluding the value 0. As placing those tiles with the value 0 in the editor is not possible and the tiles with this value are ignored by server and client, it also shouldn't be possible to select those values in the first place.
2022-10-26 22:04:17 +00:00
pEditor->m_TeleNumber = (NewVal - 1 + 255) % 255 + 1;
add switch empty slot finder button
2020-05-17 00:56:35 +00:00
}
Merged Oy, Cleaned up, removed some useless features and code parts Added Icon by landil alot more...
2011-04-09 06:41:31 +00:00
fix more format failures
2020-05-20 18:57:19 +00:00
if(s_PreviousNumber == 1 || s_PreviousNumber != pEditor->m_TeleNumber)
add switch empty slot finder button
2020-05-17 00:56:35 +00:00
{
Run clang-format Purely automatic change. In case of conflict with this change, apply the other change and rerun the formatting to restore it: $ python scripts/fix_style.py
2020-09-26 19:41:58 +00:00
s_Color = pEditor->m_Map.m_pTeleLayer->ContainsElementWithId(pEditor->m_TeleNumber) ? ColorRGBA(1, 0.5f, 0.5f, 0.5f) : ColorRGBA(0.5f, 1, 0.5f, 0.5f);
add switch empty slot finder button
2020-05-17 00:56:35 +00:00
}
fix some tele number picker issues
2020-05-15 22:42:11 +00:00
}
New editor feature: Show if tele and switch numbers are used already
2014-05-17 15:19:48 +00:00
fix more format failures
2020-05-20 18:57:19 +00:00
s_PreviousNumber = pEditor->m_TeleNumber;
Merged Oy, Cleaned up, removed some useless features and code parts Added Icon by landil alot more...
2011-04-09 06:41:31 +00:00
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
return CUI::POPUP_KEEP_OPEN;
Added tele, speedup, front and switch layer to the client Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-30 21:31:19 +00:00
}
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
CUI::EPopupMenuFunctionResult CEditor::PopupSpeedup(void *pContext, CUIRect View, bool Active)
Added tele, speedup, front and switch layer to the client Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-30 21:31:19 +00:00
{
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
CEditor *pEditor = static_cast<CEditor *>(pContext);
Added tele, speedup, front and switch layer to the client Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-30 21:31:19 +00:00
enum
{
Run clang-format Purely automatic change. In case of conflict with this change, apply the other change and rerun the formatting to restore it: $ python scripts/fix_style.py
2020-09-26 19:41:58 +00:00
PROP_FORCE = 0,
Added tele, speedup, front and switch layer to the client Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-30 21:31:19 +00:00
PROP_MAXSPEED,
PROP_ANGLE,
NUM_PROPS
};
Merged Oy, Cleaned up, removed some useless features and code parts Added Icon by landil alot more...
2011-04-09 06:41:31 +00:00
Added tele, speedup, front and switch layer to the client Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-30 21:31:19 +00:00
CProperty aProps[] = {
Fix incorrect minimum values for tele, speedup and switch layers It was possible to select tele number 0, speedup force 0 and switch number 0 in the layer details in the editor, because some of the bounds checks or calculations were not excluding the value 0. As placing those tiles with the value 0 in the editor is not possible and the tiles with this value are ignored by server and client, it also shouldn't be possible to select those values in the first place.
2022-10-26 22:04:17 +00:00
{"Force", pEditor->m_SpeedupForce, PROPTYPE_INT_STEP, 1, 255},
PROPTYPE_ANGLE_SCROLL mixed
2016-06-02 13:31:12 +00:00
{"Max Speed", pEditor->m_SpeedupMaxSpeed, PROPTYPE_INT_STEP, 0, 255},
Editor: Scroll Speedup angles by 45° (finer with shift)
2015-07-08 11:55:02 +00:00
{"Angle", pEditor->m_SpeedupAngle, PROPTYPE_ANGLE_SCROLL, 0, 359},
Use nullptr in generated and editor -Wzero-as-null-pointer-constant
2022-06-13 16:28:13 +00:00
{nullptr},
Added tele, speedup, front and switch layer to the client Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-30 21:31:19 +00:00
};
static int s_aIds[NUM_PROPS] = {0};
int NewVal = 0;
int Prop = pEditor->DoProperties(&View, aProps, s_aIds, &NewVal);
if(Prop == PROP_FORCE)
Refactor `CEditor::PopupSpeedup`
2023-04-01 21:21:13 +00:00
{
Fix incorrect minimum values for tele, speedup and switch layers It was possible to select tele number 0, speedup force 0 and switch number 0 in the layer details in the editor, because some of the bounds checks or calculations were not excluding the value 0. As placing those tiles with the value 0 in the editor is not possible and the tiles with this value are ignored by server and client, it also shouldn't be possible to select those values in the first place.
2022-10-26 22:04:17 +00:00
pEditor->m_SpeedupForce = clamp(NewVal, 1, 255);
Refactor `CEditor::PopupSpeedup`
2023-04-01 21:21:13 +00:00
}
else if(Prop == PROP_MAXSPEED)
{
Added tele, speedup, front and switch layer to the client Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-30 21:31:19 +00:00
pEditor->m_SpeedupMaxSpeed = clamp(NewVal, 0, 255);
Refactor `CEditor::PopupSpeedup`
2023-04-01 21:21:13 +00:00
}
else if(Prop == PROP_ANGLE)
{
Added tele, speedup, front and switch layer to the client Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-30 21:31:19 +00:00
pEditor->m_SpeedupAngle = clamp(NewVal, 0, 359);
Refactor `CEditor::PopupSpeedup`
2023-04-01 21:21:13 +00:00
}
Merged Oy, Cleaned up, removed some useless features and code parts Added Icon by landil alot more...
2011-04-09 06:41:31 +00:00
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
return CUI::POPUP_KEEP_OPEN;
Added tele, speedup, front and switch layer to the client Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-30 21:31:19 +00:00
}
editor update and other stuff
2008-01-17 23:09:49 +00:00
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
CUI::EPopupMenuFunctionResult CEditor::PopupSwitch(void *pContext, CUIRect View, bool Active)
Added tele, speedup, front and switch layer to the client Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-30 21:31:19 +00:00
{
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
CEditor *pEditor = static_cast<CEditor *>(pContext);
Refactor `CEditor::PopupSwitch`
2023-04-01 21:26:52 +00:00
CUIRect NumberPicker, FindEmptySlot;
editor update and other stuff
2008-01-17 23:09:49 +00:00
Refactor `CEditor::PopupSwitch`
2023-04-01 21:26:52 +00:00
View.VSplitRight(15.0f, &NumberPicker, &FindEmptySlot);
NumberPicker.VSplitRight(2.0f, &NumberPicker, nullptr);
Remove redundant CUIRects, improve find button height Some of the CUIRects were calculated but never used. The height of the "Find empty slot" button is made consistent with the height of the properties shifters.
2022-11-01 21:29:12 +00:00
FindEmptySlot.HSplitTop(13.0f, &FindEmptySlot, nullptr);
FindEmptySlot.HMargin(1.0f, &FindEmptySlot);
Added tele, speedup, front and switch layer to the client Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-30 21:31:19 +00:00
add switch empty slot finder button
2020-05-17 00:56:35 +00:00
// find empty number button
New editor feature: Show if tele and switch numbers are used already
2014-05-17 15:19:48 +00:00
{
follow naming convention
2020-05-19 16:17:02 +00:00
static int s_EmptySlotPid = 0;
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
if(pEditor->DoButton_Editor(&s_EmptySlotPid, "F", 0, &FindEmptySlot, 0, "[ctrl+f] Find empty slot") || (Active && pEditor->Input()->ModifierIsPressed() && pEditor->Input()->KeyPress(KEY_F)))
New editor feature: Show if tele and switch numbers are used already
2014-05-17 15:19:48 +00:00
{
Refactor `CEditor::PopupSwitch`
2023-04-01 21:26:52 +00:00
int Number = -1;
add switch empty slot finder button
2020-05-17 00:56:35 +00:00
for(int i = 1; i <= 255; i++)
New editor feature: Show if tele and switch numbers are used already
2014-05-17 15:19:48 +00:00
{
add switch empty slot finder button
2020-05-17 00:56:35 +00:00
if(!pEditor->m_Map.m_pSwitchLayer->ContainsElementWithId(i))
New editor feature: Show if tele and switch numbers are used already
2014-05-17 15:19:48 +00:00
{
Refactor `CEditor::PopupSwitch`
2023-04-01 21:26:52 +00:00
Number = i;
add switch empty slot finder button
2020-05-17 00:56:35 +00:00
break;
New editor feature: Show if tele and switch numbers are used already
2014-05-17 15:19:48 +00:00
}
}
add switch empty slot finder button
2020-05-17 00:56:35 +00:00
Refactor `CEditor::PopupSwitch`
2023-04-01 21:26:52 +00:00
if(Number != -1)
add switch empty slot finder button
2020-05-17 00:56:35 +00:00
{
Refactor `CEditor::PopupSwitch`
2023-04-01 21:26:52 +00:00
pEditor->m_SwitchNum = Number;
add switch empty slot finder button
2020-05-17 00:56:35 +00:00
}
New editor feature: Show if tele and switch numbers are used already
2014-05-17 15:19:48 +00:00
}
add switch empty slot finder button
2020-05-17 00:56:35 +00:00
}
New editor feature: Show if tele and switch numbers are used already
2014-05-17 15:19:48 +00:00
add switch empty slot finder button
2020-05-17 00:56:35 +00:00
// number picker
Refactor `CEditor::PopupSwitch`
2023-04-01 21:26:52 +00:00
static int s_PreviousNumber = -1;
add switch empty slot finder button
2020-05-17 00:56:35 +00:00
{
follow naming convention
2020-05-19 16:17:02 +00:00
static ColorRGBA s_Color = ColorRGBA(1, 1, 1, 0.5f);
New editor feature: Show if tele and switch numbers are used already
2014-05-17 15:19:48 +00:00
add switch empty slot finder button
2020-05-17 00:56:35 +00:00
enum
{
Refactor `CEditor::PopupSwitch`
2023-04-01 21:26:52 +00:00
PROP_SWITCH_NUMBER = 0,
PROP_SWITCH_DELAY,
add switch empty slot finder button
2020-05-17 00:56:35 +00:00
NUM_PROPS,
};
CProperty aProps[] = {
Allow selecting switch number 0 in editor again This reverts part of #5993 to allow switch number 0 to be selected again. Switch number 0 is permanently enabled, so it useful for tiles that should always be switched on. Eventually tiles that don't work with switch 0 (e.g. switch open/close tiles) should be made unplaceable and the switch number should be hidden for tiles where it doesn't have any effect (e.g. jump tiles). See #5995.
2022-11-01 20:52:49 +00:00
{"Number", pEditor->m_SwitchNum, PROPTYPE_INT_STEP, 0, 255},
add switch empty slot finder button
2020-05-17 00:56:35 +00:00
{"Delay", pEditor->m_SwitchDelay, PROPTYPE_INT_STEP, 0, 255},
Use nullptr in generated and editor -Wzero-as-null-pointer-constant
2022-06-13 16:28:13 +00:00
{nullptr},
Use fixed point conversion consistently
2020-09-22 12:28:14 +00:00
};
add switch empty slot finder button
2020-05-17 00:56:35 +00:00
static int s_aIds[NUM_PROPS] = {0};
int NewVal = 0;
follow naming convention
2020-05-19 16:17:02 +00:00
int Prop = pEditor->DoProperties(&NumberPicker, aProps, s_aIds, &NewVal, s_Color);
add switch empty slot finder button
2020-05-17 00:56:35 +00:00
Refactor `CEditor::PopupSwitch`
2023-04-01 21:26:52 +00:00
if(Prop == PROP_SWITCH_NUMBER)
add switch empty slot finder button
2020-05-17 00:56:35 +00:00
{
Allow selecting switch number 0 in editor again This reverts part of #5993 to allow switch number 0 to be selected again. Switch number 0 is permanently enabled, so it useful for tiles that should always be switched on. Eventually tiles that don't work with switch 0 (e.g. switch open/close tiles) should be made unplaceable and the switch number should be hidden for tiles where it doesn't have any effect (e.g. jump tiles). See #5995.
2022-11-01 20:52:49 +00:00
pEditor->m_SwitchNum = (NewVal + 256) % 256;
add switch empty slot finder button
2020-05-17 00:56:35 +00:00
}
Refactor `CEditor::PopupSwitch`
2023-04-01 21:26:52 +00:00
else if(Prop == PROP_SWITCH_DELAY)
add switch empty slot finder button
2020-05-17 00:56:35 +00:00
{
pEditor->m_SwitchDelay = (NewVal + 256) % 256;
}
fix more format failures
2020-05-20 18:57:19 +00:00
if(s_PreviousNumber == 1 || s_PreviousNumber != pEditor->m_SwitchNum)
add switch empty slot finder button
2020-05-17 00:56:35 +00:00
{
Run clang-format Purely automatic change. In case of conflict with this change, apply the other change and rerun the formatting to restore it: $ python scripts/fix_style.py
2020-09-26 19:41:58 +00:00
s_Color = pEditor->m_Map.m_pSwitchLayer->ContainsElementWithId(pEditor->m_SwitchNum) ? ColorRGBA(1, 0.5f, 0.5f, 0.5f) : ColorRGBA(0.5f, 1, 0.5f, 0.5f);
add switch empty slot finder button
2020-05-17 00:56:35 +00:00
}
New editor feature: Show if tele and switch numbers are used already
2014-05-17 15:19:48 +00:00
}
Added tele, speedup, front and switch layer to the client Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-30 21:31:19 +00:00
fix more format failures
2020-05-20 18:57:19 +00:00
s_PreviousNumber = pEditor->m_SwitchNum;
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
return CUI::POPUP_KEEP_OPEN;
Merged Oy, Isolated Freeze from Deep Freeze
2011-02-13 05:35:13 +00:00
}
added creating button for tunelayer and a popup menu for TuneZone Numbers
2014-03-12 23:01:15 +00:00
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
CUI::EPopupMenuFunctionResult CEditor::PopupTune(void *pContext, CUIRect View, bool Active)
added creating button for tunelayer and a popup menu for TuneZone Numbers
2014-03-12 23:01:15 +00:00
{
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
CEditor *pEditor = static_cast<CEditor *>(pContext);
added creating button for tunelayer and a popup menu for TuneZone Numbers
2014-03-12 23:01:15 +00:00
enum
{
Run clang-format Purely automatic change. In case of conflict with this change, apply the other change and rerun the formatting to restore it: $ python scripts/fix_style.py
2020-09-26 19:41:58 +00:00
PROP_TUNE = 0,
added creating button for tunelayer and a popup menu for TuneZone Numbers
2014-03-12 23:01:15 +00:00
NUM_PROPS,
};
CProperty aProps[] = {
{"Zone", pEditor->m_TuningNum, PROPTYPE_INT_STEP, 1, 255},
Use nullptr in generated and editor -Wzero-as-null-pointer-constant
2022-06-13 16:28:13 +00:00
{nullptr},
added creating button for tunelayer and a popup menu for TuneZone Numbers
2014-03-12 23:01:15 +00:00
};
static int s_aIds[NUM_PROPS] = {0};
int NewVal = 0;
int Prop = pEditor->DoProperties(&View, aProps, s_aIds, &NewVal);
if(Prop == PROP_TUNE)
Refactor `CEditor::PopupTune`
2023-04-01 21:22:03 +00:00
{
Make a few value selectors in editor wrap around
2015-06-28 14:17:23 +00:00
pEditor->m_TuningNum = (NewVal - 1 + 255) % 255 + 1;
Refactor `CEditor::PopupTune`
2023-04-01 21:22:03 +00:00
}
added creating button for tunelayer and a popup menu for TuneZone Numbers
2014-03-12 23:01:15 +00:00
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
return CUI::POPUP_KEEP_OPEN;
added creating button for tunelayer and a popup menu for TuneZone Numbers
2014-03-12 23:01:15 +00:00
}
Implement an HSV picker for color of quad points
2015-08-17 12:10:08 +00:00
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
CUI::EPopupMenuFunctionResult CEditor::PopupGoto(void *pContext, CUIRect View, bool Active)
Editor: added a goto button
2022-08-20 18:47:46 +00:00
{
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
CEditor *pEditor = static_cast<CEditor *>(pContext);
Editor: added a goto button
2022-08-20 18:47:46 +00:00
enum
{
Refactor `CEditor::PopupGoto`
2023-04-01 10:35:29 +00:00
PROP_COORD_X = 0,
PROP_COORD_Y,
Editor: added a goto button
2022-08-20 18:47:46 +00:00
NUM_PROPS,
};
Refactor `CEditor::PopupGoto`
2023-04-01 10:35:29 +00:00
static ivec2 s_GotoPos(0, 0);
Editor: added a goto button
2022-08-20 18:47:46 +00:00
CProperty aProps[] = {
Refactor `CEditor::PopupGoto`
2023-04-01 10:35:29 +00:00
{"X", s_GotoPos.x, PROPTYPE_INT_STEP, std::numeric_limits<int>::min(), std::numeric_limits<int>::max()},
{"Y", s_GotoPos.y, PROPTYPE_INT_STEP, std::numeric_limits<int>::min(), std::numeric_limits<int>::max()},
Editor: added a goto button
2022-08-20 18:47:46 +00:00
{nullptr},
};
static int s_aIds[NUM_PROPS] = {0};
int NewVal = 0;
Refactor `CEditor::PopupGoto`
2023-04-01 10:35:29 +00:00
int Prop = pEditor->DoProperties(&View, aProps, s_aIds, &NewVal, ColorRGBA(1, 1, 1, 0.5f));
Editor: added a goto button
2022-08-20 18:47:46 +00:00
Refactor `CEditor::PopupGoto`
2023-04-01 10:35:29 +00:00
if(Prop == PROP_COORD_X)
Editor: added a goto button
2022-08-20 18:47:46 +00:00
{
Refactor `CEditor::PopupGoto`
2023-04-01 10:35:29 +00:00
s_GotoPos.x = NewVal;
Editor: added a goto button
2022-08-20 18:47:46 +00:00
}
Refactor `CEditor::PopupGoto`
2023-04-01 10:35:29 +00:00
else if(Prop == PROP_COORD_Y)
Editor: added a goto button
2022-08-20 18:47:46 +00:00
{
Refactor `CEditor::PopupGoto`
2023-04-01 10:35:29 +00:00
s_GotoPos.y = NewVal;
Editor: added a goto button
2022-08-20 18:47:46 +00:00
}
CUIRect Button;
View.HSplitBottom(12.0f, &View, &Button);
static int s_Button;
Refactor `CEditor::PopupGoto`
2023-04-01 10:35:29 +00:00
if(pEditor->DoButton_Editor(&s_Button, "Go", 0, &Button, 0, nullptr))
Editor: added a goto button
2022-08-20 18:47:46 +00:00
{
Refactor `CEditor::PopupGoto`
2023-04-01 10:35:29 +00:00
pEditor->Goto(s_GotoPos.x + 0.5f, s_GotoPos.y + 0.5f);
Editor: added a goto button
2022-08-20 18:47:46 +00:00
}
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
return CUI::POPUP_KEEP_OPEN;
Editor: added a goto button
2022-08-20 18:47:46 +00:00
}
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
CUI::EPopupMenuFunctionResult CEditor::PopupEntities(void *pContext, CUIRect View, bool Active)
Allow choosing game layer entities for different gametypes, closes #1283
2018-10-01 21:04:43 +00:00
{
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
CEditor *pEditor = static_cast<CEditor *>(pContext);
Refactor `CEditor::PopupEntities`
2023-04-01 21:22:27 +00:00
for(size_t i = 0; i < pEditor->m_vSelectEntitiesFiles.size(); i++)
Allow choosing game layer entities for different gametypes, closes #1283
2018-10-01 21:04:43 +00:00
{
CUIRect Button;
View.HSplitTop(14.0f, &Button, &View);
Huge variable naming format Fix pointer and pointer array variable naming Huge renaming to match our rules Used regex: (?!(return|delete)\b)\b\w+ (m_|ms_|g_|gs_|s_)[^a]\w+\[ (?!(return|delete)\b)\b\w+ (?!(m_|ms_|g_|gs_|s_))[^a]\w+\[ Further format static variables Format almost all pointer names accordingly Used regex: (?!(return)\b)\b\w+ \*(?!(m_p|p|s_p|m_ap|s_ap|g_p|g_ap|ap|gs_ap|ms_ap|gs_p|ms_p))\w+\b[^:\(p] clang-format Fix CI fail Fix misnamed non pointer as pointer and non array as array Used regex: (?!(return|delete)\b)\b\w+ (m_|ms_|g_|gs_|s_)p\w+\b (?!return\b)\b\w+ (ms_|m_|g_|gs_|s_)a\w+\b[^\[] clang-format Revert to SCREAMING_SNAKE_CASE and reinstate dead code
2022-06-30 22:36:32 +00:00
const char *pName = pEditor->m_vSelectEntitiesFiles[i].c_str();
if(pEditor->DoButton_MenuItem(pName, pName, pEditor->m_vSelectEntitiesFiles[i] == pEditor->m_SelectEntitiesImage, &Button))
Run clang-format Purely automatic change. In case of conflict with this change, apply the other change and rerun the formatting to restore it: $ python scripts/fix_style.py
2020-09-26 19:41:58 +00:00
{
Format vector variables names (fixes #5209)
2022-06-11 19:38:18 +00:00
if(pEditor->m_vSelectEntitiesFiles[i] != pEditor->m_SelectEntitiesImage)
Run clang-format Purely automatic change. In case of conflict with this change, apply the other change and rerun the formatting to restore it: $ python scripts/fix_style.py
2020-09-26 19:41:58 +00:00
{
Format vector variables names (fixes #5209)
2022-06-11 19:38:18 +00:00
pEditor->m_SelectEntitiesImage = pEditor->m_vSelectEntitiesFiles[i];
Disable unused tiles only for DDNet entities
2019-02-08 02:10:12 +00:00
pEditor->m_AllowPlaceUnusedTiles = pEditor->m_SelectEntitiesImage == "DDNet" ? 0 : -1;
pEditor->m_PreventUnusedTilesWasWarned = false;
List all game layer entities images in directory
2018-10-02 21:08:17 +00:00
lazy load editor textures improve entities texture flags
2022-02-11 10:10:03 +00:00
if(pEditor->m_EntitiesTexture.IsValid())
pEditor->Graphics()->UnloadTexture(&pEditor->m_EntitiesTexture);
Refactor `CEditor::PopupEntities`
2023-04-01 21:22:27 +00:00
char aBuf[IO_MAX_PATH_LENGTH];
str_format(aBuf, sizeof(aBuf), "editor/entities/%s.png", pName);
pEditor->m_EntitiesTexture = pEditor->Graphics()->LoadTexture(aBuf, IStorage::TYPE_ALL, CImageInfo::FORMAT_AUTO, pEditor->GetTextureUsageFlag());
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
return CUI::POPUP_CLOSE_CURRENT;
Allow choosing game layer entities for different gametypes, closes #1283
2018-10-01 21:04:43 +00:00
}
}
}
Move generic popup handling to UI (port from editor and upstream) Support using editor popup rendering in game client. Support unlimited number of popup menus instead of maximum of 8. Fix non-active popups handling key events. Add `Active` parameter to popup function, so key events are only processed by the active (top-most) popup. Previously the "New folder" popup could be confirmed with enter while an error message is shown, which causes multiple error messages to stack. Allow popups to close without closing their child popups. Previously a popup could not open another popup and close itself immediately afterwards, as this was causing the newly opened popup to be closed instead. Support using return/enter keys to confirm binary choice popups and to close message popups for more convenient usage.
2023-03-27 15:22:17 +00:00
return CUI::POPUP_KEEP_OPEN;
Add generic selection popup to editor Add `CEditor::ShowPopupSelection` to show a generic selection popup. This popups shows a message and buttons for all entries in a `std::set`. Exactly one entry can be selected and the selection will be available to the caller in the given `SSelectionPopupContext`.
2022-11-05 13:16:00 +00:00
}
combine proof mode buttons
2023-05-01 21:07:58 +00:00
CUI::EPopupMenuFunctionResult CEditor::PopupProofMode(void *pContext, CUIRect View, bool Active)
{
CEditor *pEditor = static_cast<CEditor *>(pContext);
CUIRect Button;
View.HSplitTop(12.0f, &Button, &View);
static int s_ButtonIngame;
Modified some files
2023-05-21 19:26:23 +00:00
if(pEditor->DoButton_MenuItem(&s_ButtonIngame, "Ingame", pEditor->m_ProofBorders == PROOF_BORDER_INGAME, &Button, 0, "These borders represent what a player maximum can see."))
combine proof mode buttons
2023-05-01 21:07:58 +00:00
{
Modifications in three files
2023-05-21 16:00:41 +00:00
pEditor->m_ProofBorders = PROOF_BORDER_INGAME;
combine proof mode buttons
2023-05-01 21:07:58 +00:00
return CUI::POPUP_CLOSE_CURRENT;
}
View.HSplitTop(2.0f, nullptr, &View);
View.HSplitTop(12.0f, &Button, &View);
static int s_ButtonMenu;
Modified some files
2023-05-21 19:26:23 +00:00
if(pEditor->DoButton_MenuItem(&s_ButtonMenu, "Menu", pEditor->m_ProofBorders == PROOF_BORDER_MENU, &Button, 0, "These borders represent what will be shown in the menu."))
combine proof mode buttons
2023-05-01 21:07:58 +00:00
{
Modified some files
2023-05-21 19:26:23 +00:00
pEditor->m_ProofBorders = PROOF_BORDER_MENU;
combine proof mode buttons
2023-05-01 21:07:58 +00:00
return CUI::POPUP_CLOSE_CURRENT;
}
return CUI::POPUP_KEEP_OPEN;
}
Reference in a new issue Copy permalink