Index: binaries/data/mods/mod/gui/gui.rnc
===================================================================
--- binaries/data/mods/mod/gui/gui.rnc
+++ binaries/data/mods/mod/gui/gui.rnc
@@ -71,6 +71,8 @@
attribute maxwidth { xsd:decimal }? &
attribute multiline { bool }?&
attribute offset { pos }?&
+ attribute placeholder_text { text }?&
+ attribute placeholder_color { ccolor }?&
attribute readonly { bool }?&
attribute scrollbar { bool }?&
attribute scrollbar_style { text }?&
Index: binaries/data/mods/mod/gui/gui.rng
===================================================================
--- binaries/data/mods/mod/gui/gui.rng
+++ binaries/data/mods/mod/gui/gui.rng
@@ -435,6 +435,14 @@
+
+
+
+
+
+
+
+
Index: binaries/data/mods/mod/gui/modmod/modmod.js
===================================================================
--- binaries/data/mods/mod/gui/modmod/modmod.js
+++ binaries/data/mods/mod/gui/modmod/modmod.js
@@ -99,8 +99,6 @@
function initGUIFilters()
{
Engine.GetGUIObjectByName("negateFilter").checked = false;
- Engine.GetGUIObjectByName("modGenericFilter").caption = translate("Filter");
-
displayModLists();
}
@@ -230,7 +228,6 @@
let searchText = Engine.GetGUIObjectByName("modGenericFilter").caption;
if (searchText &&
- searchText != translate("Filter") &&
folder.indexOf(searchText) == -1 &&
mod.name.indexOf(searchText) == -1 &&
mod.label.indexOf(searchText) == -1 &&
Index: binaries/data/mods/mod/gui/modmod/modmod.xml
===================================================================
--- binaries/data/mods/mod/gui/modmod/modmod.xml
+++ binaries/data/mods/mod/gui/modmod/modmod.xml
@@ -18,9 +18,11 @@
type="input"
style="ModernInput"
size="16 0 176 100%"
+ placeholder_color="gray"
>
applyFilters();
applyFilters();
+ Filter
Index: source/gui/ObjectTypes/CInput.h
===================================================================
--- source/gui/ObjectTypes/CInput.h
+++ source/gui/ObjectTypes/CInput.h
@@ -194,6 +194,7 @@
i32 m_BufferPosition;
float m_BufferZone;
CStrW m_Caption;
+ CStrW m_PlaceholderText;
i32 m_CellID;
CStrW m_Font;
CStrW m_MaskChar;
@@ -207,6 +208,7 @@
CGUISpriteInstance m_SpriteSelectArea;
CGUIColor m_TextColor;
CGUIColor m_TextColorSelected;
+ CGUIColor m_PlaceholderColor;
};
#endif // INCLUDED_CINPUT
Index: source/gui/ObjectTypes/CInput.cpp
===================================================================
--- source/gui/ObjectTypes/CInput.cpp
+++ source/gui/ObjectTypes/CInput.cpp
@@ -85,6 +85,8 @@
RegisterSetting("sprite_selectarea", m_SpriteSelectArea);
RegisterSetting("textcolor", m_TextColor);
RegisterSetting("textcolor_selected", m_TextColorSelected);
+ RegisterSetting("placeholder_text", m_PlaceholderText);
+ RegisterSetting("placeholder_color", m_PlaceholderColor);
CFG_GET_VAL("gui.cursorblinkrate", m_CursorBlinkRate);
@@ -1471,6 +1473,11 @@
textRenderer.SetTransform(savedTransform);
}
+ if (!m_Caption.length() && m_PlaceholderText.length())
+ {
+ textRenderer.Color(m_PlaceholderColor);
+ textRenderer.PutAdvance(&m_PlaceholderText[0]);
+ }
textRenderer.Translate(0.f, ls, 0.f);
}