PulseStudio/VoxelEngine
PulseStudio/VoxelEngine
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

fix UINode function typedefs naming

Browse Source
This commit is contained in:
MihailRis 2025-11-14 12:35:27 +03:00
parent 7abe552e3c
commit f9bab5a5cf
7 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/graphics/ui/elements/Button.cpp
View File

@ -31,7 +31,7 @@ Button::Button(
GUI& gui, GUI& gui,
const std::wstring& text, const std::wstring& text,
glm::vec4 padding, glm::vec4 padding,
const onaction& action, const OnAction& action,
glm::vec2 size glm::vec2 size
) )
: Panel(gui, size, padding, 0.0f) { : Panel(gui, size, padding, 0.0f) {

2
src/graphics/ui/elements/Button.hpp
View File

@ -19,7 +19,7 @@ namespace gui {
GUI& gui, GUI& gui,
const std::wstring& text, const std::wstring& text,
glm::vec4 padding, glm::vec4 padding,
const onaction& action, const OnAction& action,
glm::vec2 size = glm::vec2(-1) glm::vec2 size = glm::vec2(-1)
); );

2
src/graphics/ui/elements/SelectBox.cpp
View File

@ -41,7 +41,7 @@ SelectBox::SelectBox(
}); });
} }
void SelectBox::listenChange(onstringchange&& callback) { void SelectBox::listenChange(OnStringChange&& callback) {
changeCallbacks.listen(std::move(callback)); changeCallbacks.listen(std::move(callback));
} }

2
src/graphics/ui/elements/SelectBox.hpp
View File

@ -24,7 +24,7 @@ namespace gui {
const glm::vec4& padding const glm::vec4& padding
); );
void listenChange(onstringchange&& callback); void listenChange(OnStringChange&& callback);
void setSelected(const Option& selected); void setSelected(const Option& selected);

8
src/graphics/ui/elements/UINode.cpp
View File

@ -64,22 +64,22 @@ UINode* UINode::getParent() const {
return parent; return parent;
} }
UINode* UINode::listenAction(const onaction& action) { UINode* UINode::listenAction(const OnAction& action) {
actions.listen(action); actions.listen(action);
return this; return this;
} }
UINode* UINode::listenDoubleClick(const onaction& action) { UINode* UINode::listenDoubleClick(const OnAction& action) {
doubleClickCallbacks.listen(action); doubleClickCallbacks.listen(action);
return this; return this;
} }
UINode* UINode::listenFocus(const onaction& action) { UINode* UINode::listenFocus(const OnAction& action) {
focusCallbacks.listen(action); focusCallbacks.listen(action);
return this; return this;
} }
UINode* UINode::listenDefocus(const onaction& action) { UINode* UINode::listenDefocus(const OnAction& action) {
defocusCallbacks.listen(action); defocusCallbacks.listen(action);
return this; return this;
} }

14
src/graphics/ui/elements/UINode.hpp
View File

@ -19,9 +19,9 @@ namespace gui {
class GUI; class GUI;
class Container; class Container;
using onaction = std::function<void(GUI&)>; using OnAction = std::function<void(GUI&)>;
using onnumberchange = std::function<void(GUI&, double)>; using OnNumberChange = std::function<void(GUI&, double)>;
using onstringchange = std::function<void(GUI&, const std::string&)>; using OnStringChange = std::function<void(GUI&, const std::string&)>;
template<typename... Args> template<typename... Args>
class CallbacksSet { class CallbacksSet {
@ -187,10 +187,10 @@ namespace gui {
/// @brief Get element z-index /// @brief Get element z-index
int getZIndex() const; int getZIndex() const;
virtual UINode* listenAction(const onaction& action); virtual UINode* listenAction(const OnAction& action);
virtual UINode* listenDoubleClick(const onaction& action); virtual UINode* listenDoubleClick(const OnAction& action);
virtual UINode* listenFocus(const onaction& action); virtual UINode* listenFocus(const OnAction& action);
virtual UINode* listenDefocus(const onaction& action); virtual UINode* listenDefocus(const OnAction& action);
virtual void onFocus(); virtual void onFocus();
virtual void doubleClick(int x, int y); virtual void doubleClick(int x, int y);

2
src/graphics/ui/gui_xml.cpp
View File

@ -73,7 +73,7 @@ static runnable create_runnable(
return nullptr; return nullptr;
} }
static onaction create_action( static OnAction create_action(
const UiXmlReader& reader, const UiXmlReader& reader,
const xml::xmlelement& element, const xml::xmlelement& element,
const std::string& name const std::string& name