Readded chat box
This commit is contained in:
parent
99c2657434
commit
60af55d4db
19 changed files with 307 additions and 249 deletions
|
|
@ -355,12 +355,14 @@ void BookmarkManager::setup_list_gui() {
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
if(editingBookmark) {
|
auto editingBookmarkLock = editingBookmark.lock();
|
||||||
text_label_centered(gui, editingBookmark->is_folder() ? "Edit Bookmark Folder" : "Edit Bookmark");
|
if(editingBookmarkLock) {
|
||||||
|
text_label_centered(gui, editingBookmarkLock->is_folder() ? "Edit Bookmark Folder" : "Edit Bookmark");
|
||||||
input_text_field(gui, "input edit name", "Name", &nameToEdit, {
|
input_text_field(gui, "input edit name", "Name", &nameToEdit, {
|
||||||
.onEdit = [&] {
|
.onEdit = [&] {
|
||||||
if(editingBookmark) { // This can be set to null on the way here (close bookmark popup when textbox is selected)
|
auto editingBookmarkLock = editingBookmark.lock();
|
||||||
editingBookmark->set_name(world.delayedUpdateObjectManager, nameToEdit);
|
if(editingBookmarkLock) { // This can be set to null on the way here (close bookmark popup when textbox is selected)
|
||||||
|
editingBookmarkLock->set_name(world.delayedUpdateObjectManager, nameToEdit);
|
||||||
world.main.g.gui.set_to_layout();
|
world.main.g.gui.set_to_layout();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -572,18 +574,19 @@ void BookmarkManager::editing_bookmark_check() {
|
||||||
WorldUndoManager::UndoObjectID undoID;
|
WorldUndoManager::UndoObjectID undoID;
|
||||||
};
|
};
|
||||||
|
|
||||||
if(editingBookmark) {
|
auto editingBookmarkLock = editingBookmark.lock();
|
||||||
const std::string& currentNameData = editingBookmark->get_name();
|
if(editingBookmarkLock) {
|
||||||
|
const std::string& currentNameData = editingBookmarkLock->get_name();
|
||||||
if(currentNameData != editingBookmarkOldName.value())
|
if(currentNameData != editingBookmarkOldName.value())
|
||||||
world.undo.push(std::make_unique<EditBookmarkWorldUndoAction>(editingBookmarkOldName.value(), world.undo.get_undoid_from_netid(editingBookmark.get_net_id())));
|
world.undo.push(std::make_unique<EditBookmarkWorldUndoAction>(editingBookmarkOldName.value(), world.undo.get_undoid_from_netid(editingBookmark.get_net_id())));
|
||||||
}
|
}
|
||||||
|
|
||||||
if(selectedBookmarkIndices.size() == 1) {
|
if(selectedBookmarkIndices.size() == 1) {
|
||||||
editingBookmark = get_bookmark_from_obj_index(*selectedBookmarkIndices.begin());
|
editingBookmark = get_bookmark_from_obj_index(*selectedBookmarkIndices.begin());
|
||||||
editingBookmarkOldName = editingBookmark->get_name();
|
editingBookmarkOldName = editingBookmark.lock()->get_name();
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
editingBookmark = NetworkingObjects::NetObjTemporaryPtr<BookmarkListItem>();
|
editingBookmark.reset();
|
||||||
editingBookmarkOldName = std::nullopt;
|
editingBookmarkOldName = std::nullopt;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -33,7 +33,7 @@ class BookmarkManager {
|
||||||
|
|
||||||
std::set<GUIStuff::TreeListingObjIndexList> selectedBookmarkIndices;
|
std::set<GUIStuff::TreeListingObjIndexList> selectedBookmarkIndices;
|
||||||
|
|
||||||
NetworkingObjects::NetObjTemporaryPtr<BookmarkListItem> editingBookmark;
|
NetworkingObjects::NetObjWeakPtr<BookmarkListItem> editingBookmark;
|
||||||
std::optional<std::string> editingBookmarkOldName;
|
std::optional<std::string> editingBookmarkOldName;
|
||||||
|
|
||||||
void editing_bookmark_check();
|
void editing_bookmark_check();
|
||||||
|
|
|
||||||
|
|
@ -391,12 +391,14 @@ void DrawingProgramLayerManagerGUI::setup_list_gui() {
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
if(editingLayer) {
|
auto editingLayerLock = editingLayer.lock();
|
||||||
text_label_centered(gui, editingLayer->is_folder() ? "Edit Layer Folder" : "Edit Layer");
|
if(editingLayerLock) {
|
||||||
|
text_label_centered(gui, editingLayerLock->is_folder() ? "Edit Layer Folder" : "Edit Layer");
|
||||||
input_text_field(gui, "input edit name", "Name", &nameToEdit, {
|
input_text_field(gui, "input edit name", "Name", &nameToEdit, {
|
||||||
.onEdit = [&] {
|
.onEdit = [&] {
|
||||||
if(editingLayer) { // This can be set to null on the way here (close layer popup when textbox is selected)
|
auto editingLayerLock = editingLayer.lock();
|
||||||
editingLayer->set_name(world.delayedUpdateObjectManager, nameToEdit);
|
if(editingLayerLock) { // This can be set to null on the way here (close layer popup when textbox is selected)
|
||||||
|
editingLayerLock->set_name(world.delayedUpdateObjectManager, nameToEdit);
|
||||||
world.main.g.gui.set_to_layout();
|
world.main.g.gui.set_to_layout();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -404,9 +406,10 @@ void DrawingProgramLayerManagerGUI::setup_list_gui() {
|
||||||
slider_scalar_field(gui, "input alpha slider", "Alpha", &alphaValToEdit, 0.0f, 1.0f, {
|
slider_scalar_field(gui, "input alpha slider", "Alpha", &alphaValToEdit, 0.0f, 1.0f, {
|
||||||
.decimalPrecision = 2,
|
.decimalPrecision = 2,
|
||||||
.onEdit = [&] {
|
.onEdit = [&] {
|
||||||
if(editingLayer) {
|
auto editingLayerLock = editingLayer.lock();
|
||||||
editingLayer->set_name(world.delayedUpdateObjectManager, nameToEdit);
|
if(editingLayerLock) {
|
||||||
editingLayer->set_alpha(layerMan, alphaValToEdit);
|
editingLayerLock->set_name(world.delayedUpdateObjectManager, nameToEdit);
|
||||||
|
editingLayerLock->set_alpha(layerMan, alphaValToEdit);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
@ -415,8 +418,9 @@ void DrawingProgramLayerManagerGUI::setup_list_gui() {
|
||||||
gui.element<DropDown<size_t>>("input blend mode", &blendModeValToEdit, get_blend_mode_useful_name_list(), DropdownOptions{
|
gui.element<DropDown<size_t>>("input blend mode", &blendModeValToEdit, get_blend_mode_useful_name_list(), DropdownOptions{
|
||||||
.width = 190.0f,
|
.width = 190.0f,
|
||||||
.onClick = [&] {
|
.onClick = [&] {
|
||||||
if(editingLayer)
|
auto editingLayerLock = editingLayer.lock();
|
||||||
editingLayer->set_blend_mode(layerMan, get_blend_mode_useful_list()[blendModeValToEdit]);
|
if(editingLayerLock)
|
||||||
|
editingLayerLock->set_blend_mode(layerMan, get_blend_mode_useful_list()[blendModeValToEdit]);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
@ -603,19 +607,19 @@ void DrawingProgramLayerManagerGUI::editing_layer_check() {
|
||||||
WorldUndoManager::UndoObjectID undoID;
|
WorldUndoManager::UndoObjectID undoID;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
auto editingLayerLock = editingLayer.lock();
|
||||||
if(editingLayer) {
|
if(editingLayerLock) {
|
||||||
const DrawingProgramLayerListItemMetaInfo& currentMetaData = editingLayer->get_metainfo();
|
const DrawingProgramLayerListItemMetaInfo& currentMetaData = editingLayerLock->get_metainfo();
|
||||||
if(currentMetaData != editingLayerOldMetainfo.value())
|
if(currentMetaData != editingLayerOldMetainfo.value())
|
||||||
world.undo.push(std::make_unique<EditLayerWorldUndoAction>(std::make_unique<DrawingProgramLayerListItemMetaInfo>(editingLayerOldMetainfo.value()), world.undo.get_undoid_from_netid(editingLayer.get_net_id())));
|
world.undo.push(std::make_unique<EditLayerWorldUndoAction>(std::make_unique<DrawingProgramLayerListItemMetaInfo>(editingLayerOldMetainfo.value()), world.undo.get_undoid_from_netid(editingLayer.get_net_id())));
|
||||||
}
|
}
|
||||||
|
|
||||||
if(selectedLayerIndices.size() == 1) {
|
if(selectedLayerIndices.size() == 1) {
|
||||||
editingLayer = get_layer_from_obj_index(*selectedLayerIndices.begin());
|
editingLayer = get_layer_from_obj_index(*selectedLayerIndices.begin());
|
||||||
editingLayerOldMetainfo = editingLayer->get_metainfo();
|
editingLayerOldMetainfo = editingLayer.lock()->get_metainfo();
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
editingLayer = NetworkingObjects::NetObjTemporaryPtr<DrawingProgramLayerListItem>();
|
editingLayer.reset();
|
||||||
editingLayerOldMetainfo = std::nullopt;
|
editingLayerOldMetainfo = std::nullopt;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -29,7 +29,7 @@ class DrawingProgramLayerManagerGUI {
|
||||||
size_t blendModeValToEdit = 0;
|
size_t blendModeValToEdit = 0;
|
||||||
|
|
||||||
std::set<GUIStuff::TreeListingObjIndexList> selectedLayerIndices;
|
std::set<GUIStuff::TreeListingObjIndexList> selectedLayerIndices;
|
||||||
NetworkingObjects::NetObjTemporaryPtr<DrawingProgramLayerListItem> editingLayer;
|
NetworkingObjects::NetObjWeakPtr<DrawingProgramLayerListItem> editingLayer;
|
||||||
|
|
||||||
std::optional<DrawingProgramLayerListItemMetaInfo> editingLayerOldMetainfo;
|
std::optional<DrawingProgramLayerListItemMetaInfo> editingLayerOldMetainfo;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -12,6 +12,7 @@ template <typename OptT> SelectableButton::Data selectable_button_options_to_dat
|
||||||
SelectableButton::Data toRet;
|
SelectableButton::Data toRet;
|
||||||
toRet.onClick = options.onClick;
|
toRet.onClick = options.onClick;
|
||||||
toRet.isSelected = options.isSelected;
|
toRet.isSelected = options.isSelected;
|
||||||
|
toRet.instantResponse = options.instantResponse;
|
||||||
toRet.drawType = options.drawType;
|
toRet.drawType = options.drawType;
|
||||||
toRet.onClickButton = options.onClickButton;
|
toRet.onClickButton = options.onClickButton;
|
||||||
return toRet;
|
return toRet;
|
||||||
|
|
@ -20,6 +21,7 @@ template <typename OptT> SelectableButton::Data selectable_button_options_to_dat
|
||||||
struct TextButtonOptions {
|
struct TextButtonOptions {
|
||||||
SelectableButton::DrawType drawType = SelectableButton::DrawType::FILLED;
|
SelectableButton::DrawType drawType = SelectableButton::DrawType::FILLED;
|
||||||
bool isSelected = false;
|
bool isSelected = false;
|
||||||
|
bool instantResponse = false;
|
||||||
bool wide = false;
|
bool wide = false;
|
||||||
bool centered = true;
|
bool centered = true;
|
||||||
|
|
||||||
|
|
@ -30,6 +32,7 @@ struct TextButtonOptions {
|
||||||
struct SVGButtonOptions {
|
struct SVGButtonOptions {
|
||||||
SelectableButton::DrawType drawType = SelectableButton::DrawType::FILLED;
|
SelectableButton::DrawType drawType = SelectableButton::DrawType::FILLED;
|
||||||
bool isSelected = false;
|
bool isSelected = false;
|
||||||
|
bool instantResponse = false;
|
||||||
float size = BIG_BUTTON_SIZE;
|
float size = BIG_BUTTON_SIZE;
|
||||||
|
|
||||||
std::function<void()> onClick;
|
std::function<void()> onClick;
|
||||||
|
|
@ -39,6 +42,7 @@ struct SVGButtonOptions {
|
||||||
struct FixedSizeColorButtonOptions {
|
struct FixedSizeColorButtonOptions {
|
||||||
SelectableButton::DrawType drawType = SelectableButton::DrawType::FILLED;
|
SelectableButton::DrawType drawType = SelectableButton::DrawType::FILLED;
|
||||||
bool isSelected = false;
|
bool isSelected = false;
|
||||||
|
bool instantResponse = false;
|
||||||
bool hasAlpha = true;
|
bool hasAlpha = true;
|
||||||
float size = BIG_BUTTON_SIZE;
|
float size = BIG_BUTTON_SIZE;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,6 @@ namespace GUIStuff { namespace ElementHelpers {
|
||||||
|
|
||||||
template <typename T, typename OptT> TextBoxData<T> textbox_options_to_data(const OptT& options) {
|
template <typename T, typename OptT> TextBoxData<T> textbox_options_to_data(const OptT& options) {
|
||||||
TextBoxData<T> toRet;
|
TextBoxData<T> toRet;
|
||||||
toRet.updateEveryEdit = options.updateEveryEdit;
|
|
||||||
toRet.onEnter = options.onEnter;
|
toRet.onEnter = options.onEnter;
|
||||||
toRet.onEdit = options.onEdit;
|
toRet.onEdit = options.onEdit;
|
||||||
toRet.immutable = options.immutable;
|
toRet.immutable = options.immutable;
|
||||||
|
|
@ -18,7 +17,6 @@ template <typename T, typename OptT> TextBoxData<T> textbox_options_to_data(cons
|
||||||
}
|
}
|
||||||
|
|
||||||
struct TextBoxOptions {
|
struct TextBoxOptions {
|
||||||
bool updateEveryEdit = true;
|
|
||||||
bool immutable = false;
|
bool immutable = false;
|
||||||
std::function<void()> onEnter;
|
std::function<void()> onEnter;
|
||||||
std::function<void()> onEdit;
|
std::function<void()> onEdit;
|
||||||
|
|
@ -28,7 +26,6 @@ struct TextBoxOptions {
|
||||||
|
|
||||||
struct TextBoxScalarOptions {
|
struct TextBoxScalarOptions {
|
||||||
int decimalPrecision = 0;
|
int decimalPrecision = 0;
|
||||||
bool updateEveryEdit = true;
|
|
||||||
bool immutable = false;
|
bool immutable = false;
|
||||||
std::function<void()> onEnter;
|
std::function<void()> onEnter;
|
||||||
std::function<void()> onEdit;
|
std::function<void()> onEdit;
|
||||||
|
|
@ -38,7 +35,6 @@ struct TextBoxScalarOptions {
|
||||||
|
|
||||||
struct TextBoxScalarsOptions {
|
struct TextBoxScalarsOptions {
|
||||||
int decimalPrecision = 0;
|
int decimalPrecision = 0;
|
||||||
bool updateEveryEdit = true;
|
|
||||||
bool immutable = false;
|
bool immutable = false;
|
||||||
std::function<void(size_t)> onEnter;
|
std::function<void(size_t)> onEnter;
|
||||||
std::function<void(size_t)> onEdit;
|
std::function<void(size_t)> onEdit;
|
||||||
|
|
@ -48,7 +44,6 @@ struct TextBoxScalarsOptions {
|
||||||
|
|
||||||
struct TextBoxPathOptions {
|
struct TextBoxPathOptions {
|
||||||
std::filesystem::file_type fileTypeRestriction;
|
std::filesystem::file_type fileTypeRestriction;
|
||||||
bool updateEveryEdit = true;
|
|
||||||
bool immutable = false;
|
bool immutable = false;
|
||||||
std::function<void()> onEnter;
|
std::function<void()> onEnter;
|
||||||
std::function<void()> onEdit;
|
std::function<void()> onEdit;
|
||||||
|
|
@ -58,7 +53,6 @@ struct TextBoxPathOptions {
|
||||||
|
|
||||||
struct TextBoxHexColorOptions {
|
struct TextBoxHexColorOptions {
|
||||||
bool hasAlpha = true;
|
bool hasAlpha = true;
|
||||||
bool updateEveryEdit = true;
|
|
||||||
bool immutable = false;
|
bool immutable = false;
|
||||||
std::function<void()> onEnter;
|
std::function<void()> onEnter;
|
||||||
std::function<void()> onEdit;
|
std::function<void()> onEdit;
|
||||||
|
|
@ -122,7 +116,6 @@ template <typename TContainer, typename T> void input_scalars_field(GUIManager&
|
||||||
for(size_t i = 0; i < elemCount; i++) {
|
for(size_t i = 0; i < elemCount; i++) {
|
||||||
gui.new_id(i, [&] { input_scalar<T>(gui, "field", &(*val)[i], minVal, maxVal, TextBoxScalarOptions {
|
gui.new_id(i, [&] { input_scalar<T>(gui, "field", &(*val)[i], minVal, maxVal, TextBoxScalarOptions {
|
||||||
.decimalPrecision = options.decimalPrecision,
|
.decimalPrecision = options.decimalPrecision,
|
||||||
.updateEveryEdit = options.updateEveryEdit,
|
|
||||||
.immutable = options.immutable,
|
.immutable = options.immutable,
|
||||||
.onEnter = [f = options.onEnter, i] { if(f) f(i); },
|
.onEnter = [f = options.onEnter, i] { if(f) f(i); },
|
||||||
.onEdit = [f = options.onEdit, i] { if(f) f(i); },
|
.onEdit = [f = options.onEdit, i] { if(f) f(i); },
|
||||||
|
|
|
||||||
|
|
@ -6,6 +6,7 @@ namespace GUIStuff {
|
||||||
gui(initGUI) {}
|
gui(initGUI) {}
|
||||||
|
|
||||||
void Element::update() {}
|
void Element::update() {}
|
||||||
|
void Element::deselect() {}
|
||||||
|
|
||||||
void Element::input_paste_callback(const CustomEvents::PasteEventData& paste) { }
|
void Element::input_paste_callback(const CustomEvents::PasteEventData& paste) { }
|
||||||
void Element::input_text_key_callback(const InputManager::KeyCallbackArgs& key) { }
|
void Element::input_text_key_callback(const InputManager::KeyCallbackArgs& key) { }
|
||||||
|
|
|
||||||
|
|
@ -23,6 +23,7 @@ namespace GUIStuff {
|
||||||
Element* parent = nullptr;
|
Element* parent = nullptr;
|
||||||
|
|
||||||
virtual void update();
|
virtual void update();
|
||||||
|
virtual void deselect();
|
||||||
|
|
||||||
virtual void input_paste_callback(const CustomEvents::PasteEventData& paste);
|
virtual void input_paste_callback(const CustomEvents::PasteEventData& paste);
|
||||||
virtual void input_text_key_callback(const InputManager::KeyCallbackArgs& key);
|
virtual void input_text_key_callback(const InputManager::KeyCallbackArgs& key);
|
||||||
|
|
|
||||||
|
|
@ -14,6 +14,7 @@ void SelectableButton::layout(const Clay_ElementId& id, const Data& d) {
|
||||||
SkColor4f backgroundColorHighlight;
|
SkColor4f backgroundColorHighlight;
|
||||||
SkColor4f backgroundColor;
|
SkColor4f backgroundColor;
|
||||||
|
|
||||||
|
instantResponse = d.instantResponse;
|
||||||
onClick = [&, this, d] {
|
onClick = [&, this, d] {
|
||||||
if(d.onClickButton)
|
if(d.onClickButton)
|
||||||
d.onClickButton(this);
|
d.onClickButton(this);
|
||||||
|
|
@ -70,9 +71,15 @@ void SelectableButton::layout(const Clay_ElementId& id, const Data& d) {
|
||||||
void SelectableButton::input_mouse_button_callback(const InputManager::MouseButtonCallbackArgs& button) {
|
void SelectableButton::input_mouse_button_callback(const InputManager::MouseButtonCallbackArgs& button) {
|
||||||
bool oldIsHeld = isHeld;
|
bool oldIsHeld = isHeld;
|
||||||
isHeld = mouseHovering && button.button == InputManager::MouseButton::LEFT && button.down;
|
isHeld = mouseHovering && button.button == InputManager::MouseButton::LEFT && button.down;
|
||||||
if(isHeld)
|
if(isHeld) {
|
||||||
|
if(instantResponse) {
|
||||||
|
std::cout << "INSTANT" << std::endl;
|
||||||
|
gui.set_post_callback_func(onClick);
|
||||||
|
}
|
||||||
gui.set_to_layout();
|
gui.set_to_layout();
|
||||||
|
}
|
||||||
else if(mouseHovering && oldIsHeld && button.button == InputManager::MouseButton::LEFT && !button.down) {
|
else if(mouseHovering && oldIsHeld && button.button == InputManager::MouseButton::LEFT && !button.down) {
|
||||||
|
if(!instantResponse)
|
||||||
gui.set_post_callback_func(onClick);
|
gui.set_post_callback_func(onClick);
|
||||||
gui.set_to_layout();
|
gui.set_to_layout();
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -21,6 +21,7 @@ class SelectableButton : public Element {
|
||||||
struct Data {
|
struct Data {
|
||||||
DrawType drawType = DrawType::TRANSPARENT_ALL;
|
DrawType drawType = DrawType::TRANSPARENT_ALL;
|
||||||
bool isSelected = false;
|
bool isSelected = false;
|
||||||
|
bool instantResponse = false;
|
||||||
std::function<void()> onClick;
|
std::function<void()> onClick;
|
||||||
std::function<void(SelectableButton*)> onClickButton;
|
std::function<void(SelectableButton*)> onClickButton;
|
||||||
std::function<void(const InnerContentCallbackParameters&)> innerContent;
|
std::function<void(const InnerContentCallbackParameters&)> innerContent;
|
||||||
|
|
@ -32,6 +33,7 @@ class SelectableButton : public Element {
|
||||||
virtual void input_mouse_motion_callback(const InputManager::MouseMotionCallbackArgs& motion) override;
|
virtual void input_mouse_motion_callback(const InputManager::MouseMotionCallbackArgs& motion) override;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
bool instantResponse = false;
|
||||||
bool isHeld = false;
|
bool isHeld = false;
|
||||||
bool oldIsHovering = false;
|
bool oldIsHovering = false;
|
||||||
std::function<void()> onClick;
|
std::function<void()> onClick;
|
||||||
|
|
|
||||||
|
|
@ -14,7 +14,6 @@ template <typename T> struct TextBoxData {
|
||||||
std::function<std::optional<T>(const std::string&)> fromStr;
|
std::function<std::optional<T>(const std::string&)> fromStr;
|
||||||
std::function<std::string(const T&)> toStr;
|
std::function<std::string(const T&)> toStr;
|
||||||
bool singleLine = true;
|
bool singleLine = true;
|
||||||
bool updateEveryEdit = true;
|
|
||||||
bool immutable = false;
|
bool immutable = false;
|
||||||
InputManager::TextInputProperties textInputProps;
|
InputManager::TextInputProperties textInputProps;
|
||||||
std::function<void()> onEdit;
|
std::function<void()> onEdit;
|
||||||
|
|
@ -38,7 +37,9 @@ template <typename T> class TextBox : public Element {
|
||||||
TextBox(GUIManager& gui);
|
TextBox(GUIManager& gui);
|
||||||
|
|
||||||
void layout(const Clay_ElementId& id, const TextBoxData<T>& userInfo);
|
void layout(const Clay_ElementId& id, const TextBoxData<T>& userInfo);
|
||||||
virtual void update();
|
void select();
|
||||||
|
virtual void update() override;
|
||||||
|
virtual void deselect() override;
|
||||||
virtual void clay_draw(SkCanvas* canvas, UpdateInputData& io, Clay_RenderCommand* command, bool skiaAA) override;
|
virtual void clay_draw(SkCanvas* canvas, UpdateInputData& io, Clay_RenderCommand* command, bool skiaAA) override;
|
||||||
virtual void input_paste_callback(const CustomEvents::PasteEventData& paste) override;
|
virtual void input_paste_callback(const CustomEvents::PasteEventData& paste) override;
|
||||||
virtual void input_text_key_callback(const InputManager::KeyCallbackArgs& key) override;
|
virtual void input_text_key_callback(const InputManager::KeyCallbackArgs& key) override;
|
||||||
|
|
|
||||||
|
|
@ -71,6 +71,23 @@ template <typename T> void TextBox<T>::clay_draw(SkCanvas* canvas, UpdateInputDa
|
||||||
canvas->restore();
|
canvas->restore();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
template <typename T> void TextBox<T>::select() {
|
||||||
|
if(!is_selected()) {
|
||||||
|
SCollision::AABB<float> rect = {(boundingBox.value().min + gui.io.windowPos) * gui.io.guiScaleMultiplier, (boundingBox.value().max + gui.io.windowPos) * gui.io.guiScaleMultiplier};
|
||||||
|
unsigned id = gui.io.input->set_text_box_front(rect, userInfo.textInputProps);
|
||||||
|
edit = TextEditData(id, textbox, cur);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
template <typename T> void TextBox<T>::deselect() {
|
||||||
|
if(is_selected()) {
|
||||||
|
gui.io.input->remove_text_box(edit.value().textboxInputID);
|
||||||
|
if(userInfo.onDeselect) userInfo.onDeselect();
|
||||||
|
reset_textbox_text();
|
||||||
|
edit = std::nullopt;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
template <typename T> bool TextBox<T>::is_selected() const {
|
template <typename T> bool TextBox<T>::is_selected() const {
|
||||||
return edit.has_value();
|
return edit.has_value();
|
||||||
}
|
}
|
||||||
|
|
@ -101,7 +118,7 @@ template <typename T> void TextBox<T>::after_text_input_callback() {
|
||||||
if(userInfo.immutable)
|
if(userInfo.immutable)
|
||||||
cur->pos = cur->selectionBeginPos = cur->selectionEndPos = textbox->insert({0, 0}, userInfo.toStr(*userInfo.data));
|
cur->pos = cur->selectionBeginPos = cur->selectionEndPos = textbox->insert({0, 0}, userInfo.toStr(*userInfo.data));
|
||||||
else {
|
else {
|
||||||
if(userInfo.updateEveryEdit && update_data() && userInfo.onEdit)
|
if(update_data() && userInfo.onEdit)
|
||||||
gui.set_post_callback_func_high_priority(userInfo.onEdit);
|
gui.set_post_callback_func_high_priority(userInfo.onEdit);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -114,37 +131,22 @@ template <typename T> void TextBox<T>::input_text_callback(const InputManager::T
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename T> void TextBox<T>::input_mouse_button_callback(const InputManager::MouseButtonCallbackArgs& button) {
|
template <typename T> void TextBox<T>::input_mouse_button_callback(const InputManager::MouseButtonCallbackArgs& button) {
|
||||||
auto& io = gui.io;
|
|
||||||
|
|
||||||
isHeld = false;
|
|
||||||
|
|
||||||
if(button.button == InputManager::MouseButton::LEFT && boundingBox.has_value()) {
|
if(button.button == InputManager::MouseButton::LEFT && boundingBox.has_value()) {
|
||||||
if(button.down) {
|
if(button.down) {
|
||||||
if(mouseHovering) {
|
if(mouseHovering) {
|
||||||
if(!is_selected()) {
|
if(!is_selected()) {
|
||||||
SCollision::AABB<float> rect = {(boundingBox.value().min + io.windowPos) * io.guiScaleMultiplier, (boundingBox.value().max + io.windowPos) * io.guiScaleMultiplier};
|
select();
|
||||||
unsigned id = gui.io.input->set_text_box_front(rect, userInfo.textInputProps);
|
|
||||||
edit = TextEditData(id, textbox, cur);
|
|
||||||
gui.set_post_callback_func_high_priority([&] {
|
gui.set_post_callback_func_high_priority([&] {
|
||||||
if(userInfo.onSelect) userInfo.onSelect();
|
if(userInfo.onSelect) userInfo.onSelect();
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
isHeld = true;
|
textbox->process_mouse_left_button(*cur, button.pos - boundingBox.value().min, button.clicks, true, gui.io.input->key(InputManager::KEY_GENERIC_LSHIFT).held);
|
||||||
textbox->process_mouse_left_button(*cur, button.pos - boundingBox.value().min, button.clicks, isHeld, gui.io.input->key(InputManager::KEY_GENERIC_LSHIFT).held);
|
|
||||||
}
|
|
||||||
else if(is_selected()) {
|
|
||||||
gui.io.input->remove_text_box(edit.value().textboxInputID);
|
|
||||||
gui.set_post_callback_func_high_priority([&] {
|
|
||||||
if(update_data())
|
|
||||||
if(userInfo.onEdit) userInfo.onEdit();
|
|
||||||
if(userInfo.onDeselect) userInfo.onDeselect();
|
|
||||||
});
|
|
||||||
reset_textbox_text();
|
|
||||||
edit = std::nullopt;
|
|
||||||
}
|
}
|
||||||
|
else if(is_selected())
|
||||||
|
deselect();
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
textbox->process_mouse_left_button(*cur, button.pos - boundingBox.value().min, 0, isHeld, gui.io.input->key(InputManager::KEY_GENERIC_LSHIFT).held);
|
textbox->process_mouse_left_button(*cur, button.pos - boundingBox.value().min, 0, false, gui.io.input->key(InputManager::KEY_GENERIC_LSHIFT).held);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -482,6 +482,11 @@ bool GUIManager::cursor_obstructed() const {
|
||||||
return cursorObstructed;
|
return cursorObstructed;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void GUIManager::deselect_all() {
|
||||||
|
for(ElementContainer* e : orderedElements)
|
||||||
|
e->elem->deselect();
|
||||||
|
}
|
||||||
|
|
||||||
void GUIManager::input_paste_callback(const CustomEvents::PasteEventData& paste) {
|
void GUIManager::input_paste_callback(const CustomEvents::PasteEventData& paste) {
|
||||||
for(ElementContainer* e : orderedElements)
|
for(ElementContainer* e : orderedElements)
|
||||||
e->elem->input_paste_callback(paste);
|
e->elem->input_paste_callback(paste);
|
||||||
|
|
|
||||||
|
|
@ -43,8 +43,8 @@ class GUIManager {
|
||||||
template <typename ElementType, typename... Args> ElementType* element(const char* id, const Args&... a) {
|
template <typename ElementType, typename... Args> ElementType* element(const char* id, const Args&... a) {
|
||||||
push_id(id);
|
push_id(id);
|
||||||
|
|
||||||
Element* oldParent = parentElement;
|
|
||||||
ElementType* elem = insert_element<ElementType>();
|
ElementType* elem = insert_element<ElementType>();
|
||||||
|
Element* oldParent = parentElement;
|
||||||
elem->parent = parentElement;
|
elem->parent = parentElement;
|
||||||
parentElement = elem;
|
parentElement = elem;
|
||||||
|
|
||||||
|
|
@ -61,9 +61,8 @@ class GUIManager {
|
||||||
|
|
||||||
template <typename ElementType, typename... Args> ElementType* clipping_element(const char* id, const Args&... a) {
|
template <typename ElementType, typename... Args> ElementType* clipping_element(const char* id, const Args&... a) {
|
||||||
push_id(id);
|
push_id(id);
|
||||||
|
|
||||||
Element* oldParent = parentElement;
|
|
||||||
ElementType* elem = insert_element<ElementType>();
|
ElementType* elem = insert_element<ElementType>();
|
||||||
|
Element* oldParent = parentElement;
|
||||||
elem->parent = parentElement;
|
elem->parent = parentElement;
|
||||||
parentElement = elem;
|
parentElement = elem;
|
||||||
|
|
||||||
|
|
@ -83,11 +82,12 @@ class GUIManager {
|
||||||
clippingRegion = oldClippingRegion;
|
clippingRegion = oldClippingRegion;
|
||||||
|
|
||||||
parentElement = oldParent;
|
parentElement = oldParent;
|
||||||
|
|
||||||
pop_id();
|
pop_id();
|
||||||
return elem;
|
return elem;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void deselect_all();
|
||||||
|
|
||||||
DefaultStringArena strArena;
|
DefaultStringArena strArena;
|
||||||
|
|
||||||
void input_paste_callback(const CustomEvents::PasteEventData& paste);
|
void input_paste_callback(const CustomEvents::PasteEventData& paste);
|
||||||
|
|
|
||||||
|
|
@ -332,18 +332,18 @@ const InputManager::KeyData& InputManager::key(KeyCode kCode) {
|
||||||
return keys[kCode];
|
return keys[kCode];
|
||||||
}
|
}
|
||||||
|
|
||||||
void InputManager::set_key_down(const SDL_KeyboardEvent& e, KeyCode kCode) {
|
void InputManager::set_key_down(const SDL_KeyboardEvent& e, KeyCode kCode, bool acceptingTextInput) {
|
||||||
auto& k = keys[kCode];
|
auto& k = keys[kCode];
|
||||||
k.held = true;
|
k.held = true;
|
||||||
if(text.is_accepting_input())
|
if(acceptingTextInput)
|
||||||
main.input_text_key_callback(KeyCallbackArgs{.key = kCode, .down = e.down, .repeat = e.repeat});
|
main.input_text_key_callback(KeyCallbackArgs{.key = kCode, .down = e.down, .repeat = e.repeat});
|
||||||
else
|
else
|
||||||
main.input_key_callback(KeyCallbackArgs{.key = kCode, .down = e.down, .repeat = e.repeat});
|
main.input_key_callback(KeyCallbackArgs{.key = kCode, .down = e.down, .repeat = e.repeat});
|
||||||
}
|
}
|
||||||
|
|
||||||
void InputManager::set_key_up(const SDL_KeyboardEvent& e, KeyCode kCode) {
|
void InputManager::set_key_up(const SDL_KeyboardEvent& e, KeyCode kCode, bool acceptingTextInput) {
|
||||||
keys[kCode].held = false;
|
keys[kCode].held = false;
|
||||||
if(text.is_accepting_input())
|
if(acceptingTextInput)
|
||||||
main.input_text_key_callback(KeyCallbackArgs{.key = kCode, .down = e.down, .repeat = e.repeat});
|
main.input_text_key_callback(KeyCallbackArgs{.key = kCode, .down = e.down, .repeat = e.repeat});
|
||||||
// Send key up even if text input is happening
|
// Send key up even if text input is happening
|
||||||
main.input_key_callback(KeyCallbackArgs{.key = kCode, .down = e.down, .repeat = e.repeat});
|
main.input_key_callback(KeyCallbackArgs{.key = kCode, .down = e.down, .repeat = e.repeat});
|
||||||
|
|
@ -852,76 +852,78 @@ void InputManager::backend_key_down_update(const SDL_KeyboardEvent& e) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool acceptingTextInput = text.is_accepting_input();
|
||||||
|
|
||||||
switch(kPress) {
|
switch(kPress) {
|
||||||
case SDLK_UP:
|
case SDLK_UP:
|
||||||
set_key_down(e, KEY_GENERIC_UP);
|
set_key_down(e, KEY_GENERIC_UP, acceptingTextInput);
|
||||||
break;
|
break;
|
||||||
case SDLK_DOWN:
|
case SDLK_DOWN:
|
||||||
set_key_down(e, KEY_GENERIC_DOWN);
|
set_key_down(e, KEY_GENERIC_DOWN, acceptingTextInput);
|
||||||
break;
|
break;
|
||||||
case SDLK_LEFT:
|
case SDLK_LEFT:
|
||||||
set_key_down(e, KEY_GENERIC_LEFT);
|
set_key_down(e, KEY_GENERIC_LEFT, acceptingTextInput);
|
||||||
break;
|
break;
|
||||||
case SDLK_RIGHT:
|
case SDLK_RIGHT:
|
||||||
set_key_down(e, KEY_GENERIC_RIGHT);
|
set_key_down(e, KEY_GENERIC_RIGHT, acceptingTextInput);
|
||||||
break;
|
break;
|
||||||
case SDLK_BACKSPACE:
|
case SDLK_BACKSPACE:
|
||||||
set_key_down(e, KEY_TEXT_BACKSPACE);
|
set_key_down(e, KEY_TEXT_BACKSPACE, acceptingTextInput);
|
||||||
break;
|
break;
|
||||||
case SDLK_DELETE:
|
case SDLK_DELETE:
|
||||||
set_key_down(e, KEY_TEXT_DELETE);
|
set_key_down(e, KEY_TEXT_DELETE, acceptingTextInput);
|
||||||
break;
|
break;
|
||||||
case SDLK_HOME:
|
case SDLK_HOME:
|
||||||
set_key_down(e, KEY_TEXT_HOME);
|
set_key_down(e, KEY_TEXT_HOME, acceptingTextInput);
|
||||||
break;
|
break;
|
||||||
case SDLK_END:
|
case SDLK_END:
|
||||||
set_key_down(e, KEY_TEXT_END);
|
set_key_down(e, KEY_TEXT_END, acceptingTextInput);
|
||||||
break;
|
break;
|
||||||
case SDLK_LSHIFT:
|
case SDLK_LSHIFT:
|
||||||
set_key_down(e, KEY_GENERIC_LSHIFT);
|
set_key_down(e, KEY_GENERIC_LSHIFT, acceptingTextInput);
|
||||||
break;
|
break;
|
||||||
case SDLK_LALT:
|
case SDLK_LALT:
|
||||||
set_key_down(e, KEY_GENERIC_LALT);
|
set_key_down(e, KEY_GENERIC_LALT, acceptingTextInput);
|
||||||
break;
|
break;
|
||||||
case SDLK_LCTRL:
|
case SDLK_LCTRL:
|
||||||
set_key_down(e, KEY_GENERIC_LCTRL);
|
set_key_down(e, KEY_GENERIC_LCTRL, acceptingTextInput);
|
||||||
break;
|
break;
|
||||||
case SDLK_LMETA:
|
case SDLK_LMETA:
|
||||||
set_key_down(e, KEY_GENERIC_LMETA);
|
set_key_down(e, KEY_GENERIC_LMETA, acceptingTextInput);
|
||||||
break;
|
break;
|
||||||
case SDLK_C:
|
case SDLK_C:
|
||||||
// Use either Ctrl or Meta (command for Mac) keys. We do either instead of checking, since checking can get complicated on Emscripten
|
// Use either Ctrl or Meta (command for Mac) keys. We do either instead of checking, since checking can get complicated on Emscripten
|
||||||
if((kMod & SDL_KMOD_GUI) || (kMod & SDL_KMOD_CTRL))
|
if((kMod & SDL_KMOD_GUI) || (kMod & SDL_KMOD_CTRL))
|
||||||
set_key_down(e, KEY_TEXT_COPY);
|
set_key_down(e, KEY_TEXT_COPY, acceptingTextInput);
|
||||||
break;
|
break;
|
||||||
case SDLK_X:
|
case SDLK_X:
|
||||||
if((kMod & SDL_KMOD_GUI) || (kMod & SDL_KMOD_CTRL))
|
if((kMod & SDL_KMOD_GUI) || (kMod & SDL_KMOD_CTRL))
|
||||||
set_key_down(e, KEY_TEXT_CUT);
|
set_key_down(e, KEY_TEXT_CUT, acceptingTextInput);
|
||||||
break;
|
break;
|
||||||
case SDLK_V:
|
case SDLK_V:
|
||||||
if((kMod & SDL_KMOD_GUI) || (kMod & SDL_KMOD_CTRL))
|
if((kMod & SDL_KMOD_GUI) || (kMod & SDL_KMOD_CTRL))
|
||||||
set_key_down(e, KEY_TEXT_PASTE);
|
set_key_down(e, KEY_TEXT_PASTE, acceptingTextInput);
|
||||||
break;
|
break;
|
||||||
case SDLK_A:
|
case SDLK_A:
|
||||||
if((kMod & SDL_KMOD_GUI) || (kMod & SDL_KMOD_CTRL))
|
if((kMod & SDL_KMOD_GUI) || (kMod & SDL_KMOD_CTRL))
|
||||||
set_key_down(e, KEY_TEXT_SELECTALL);
|
set_key_down(e, KEY_TEXT_SELECTALL, acceptingTextInput);
|
||||||
break;
|
break;
|
||||||
case SDLK_Z:
|
case SDLK_Z:
|
||||||
if((kMod & SDL_KMOD_GUI) || (kMod & SDL_KMOD_CTRL))
|
if((kMod & SDL_KMOD_GUI) || (kMod & SDL_KMOD_CTRL))
|
||||||
set_key_down(e, KEY_TEXT_UNDO);
|
set_key_down(e, KEY_TEXT_UNDO, acceptingTextInput);
|
||||||
break;
|
break;
|
||||||
case SDLK_R:
|
case SDLK_R:
|
||||||
if((kMod & SDL_KMOD_GUI) || (kMod & SDL_KMOD_CTRL))
|
if((kMod & SDL_KMOD_GUI) || (kMod & SDL_KMOD_CTRL))
|
||||||
set_key_down(e, KEY_TEXT_REDO);
|
set_key_down(e, KEY_TEXT_REDO, acceptingTextInput);
|
||||||
break;
|
break;
|
||||||
case SDLK_RETURN:
|
case SDLK_RETURN:
|
||||||
set_key_down(e, KEY_GENERIC_ENTER);
|
set_key_down(e, KEY_GENERIC_ENTER, acceptingTextInput);
|
||||||
break;
|
break;
|
||||||
case SDLK_TAB:
|
case SDLK_TAB:
|
||||||
set_key_down(e, KEY_TEXT_TAB);
|
set_key_down(e, KEY_TEXT_TAB, acceptingTextInput);
|
||||||
break;
|
break;
|
||||||
case SDLK_ESCAPE:
|
case SDLK_ESCAPE:
|
||||||
set_key_down(e, KEY_GENERIC_ESCAPE);
|
set_key_down(e, KEY_GENERIC_ESCAPE, acceptingTextInput);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
|
|
@ -929,7 +931,7 @@ void InputManager::backend_key_down_update(const SDL_KeyboardEvent& e) {
|
||||||
|
|
||||||
auto f = keyAssignments.find({make_generic_key_mod(kMod), kPress});
|
auto f = keyAssignments.find({make_generic_key_mod(kMod), kPress});
|
||||||
if(f != keyAssignments.end())
|
if(f != keyAssignments.end())
|
||||||
set_key_down(e, f->second);
|
set_key_down(e, f->second, acceptingTextInput);
|
||||||
}
|
}
|
||||||
|
|
||||||
void InputManager::call_paste(CustomEvents::PasteEventDataType type, const InputManagerCallPasteInfo& info) {
|
void InputManager::call_paste(CustomEvents::PasteEventDataType type, const InputManagerCallPasteInfo& info) {
|
||||||
|
|
@ -968,66 +970,68 @@ bool InputManager::ctrl_or_meta_held() {
|
||||||
void InputManager::backend_key_up_update(const SDL_KeyboardEvent& e) {
|
void InputManager::backend_key_up_update(const SDL_KeyboardEvent& e) {
|
||||||
auto kPress = e.key;
|
auto kPress = e.key;
|
||||||
|
|
||||||
|
bool acceptingTextInput = text.is_accepting_input();
|
||||||
|
|
||||||
switch(kPress) {
|
switch(kPress) {
|
||||||
case SDLK_UP:
|
case SDLK_UP:
|
||||||
set_key_up(e, KEY_GENERIC_UP);
|
set_key_up(e, KEY_GENERIC_UP, acceptingTextInput);
|
||||||
break;
|
break;
|
||||||
case SDLK_DOWN:
|
case SDLK_DOWN:
|
||||||
set_key_up(e, KEY_GENERIC_DOWN);
|
set_key_up(e, KEY_GENERIC_DOWN, acceptingTextInput);
|
||||||
break;
|
break;
|
||||||
case SDLK_LEFT:
|
case SDLK_LEFT:
|
||||||
set_key_up(e, KEY_GENERIC_LEFT);
|
set_key_up(e, KEY_GENERIC_LEFT, acceptingTextInput);
|
||||||
break;
|
break;
|
||||||
case SDLK_RIGHT:
|
case SDLK_RIGHT:
|
||||||
set_key_up(e, KEY_GENERIC_RIGHT);
|
set_key_up(e, KEY_GENERIC_RIGHT, acceptingTextInput);
|
||||||
break;
|
break;
|
||||||
case SDLK_BACKSPACE:
|
case SDLK_BACKSPACE:
|
||||||
set_key_up(e, KEY_TEXT_BACKSPACE);
|
set_key_up(e, KEY_TEXT_BACKSPACE, acceptingTextInput);
|
||||||
break;
|
break;
|
||||||
case SDLK_DELETE:
|
case SDLK_DELETE:
|
||||||
set_key_up(e, KEY_TEXT_DELETE);
|
set_key_up(e, KEY_TEXT_DELETE, acceptingTextInput);
|
||||||
break;
|
break;
|
||||||
case SDLK_HOME:
|
case SDLK_HOME:
|
||||||
set_key_up(e, KEY_TEXT_HOME);
|
set_key_up(e, KEY_TEXT_HOME, acceptingTextInput);
|
||||||
break;
|
break;
|
||||||
case SDLK_END:
|
case SDLK_END:
|
||||||
set_key_up(e, KEY_TEXT_END);
|
set_key_up(e, KEY_TEXT_END, acceptingTextInput);
|
||||||
break;
|
break;
|
||||||
case SDLK_LSHIFT:
|
case SDLK_LSHIFT:
|
||||||
set_key_up(e, KEY_GENERIC_LSHIFT);
|
set_key_up(e, KEY_GENERIC_LSHIFT, acceptingTextInput);
|
||||||
break;
|
break;
|
||||||
case SDLK_LALT:
|
case SDLK_LALT:
|
||||||
set_key_up(e, KEY_GENERIC_LALT);
|
set_key_up(e, KEY_GENERIC_LALT, acceptingTextInput);
|
||||||
break;
|
break;
|
||||||
case SDLK_LCTRL:
|
case SDLK_LCTRL:
|
||||||
set_key_up(e, KEY_GENERIC_LCTRL);
|
set_key_up(e, KEY_GENERIC_LCTRL, acceptingTextInput);
|
||||||
break;
|
break;
|
||||||
case SDLK_C:
|
case SDLK_C:
|
||||||
set_key_up(e, KEY_TEXT_COPY);
|
set_key_up(e, KEY_TEXT_COPY, acceptingTextInput);
|
||||||
break;
|
break;
|
||||||
case SDLK_X:
|
case SDLK_X:
|
||||||
set_key_up(e, KEY_TEXT_CUT);
|
set_key_up(e, KEY_TEXT_CUT, acceptingTextInput);
|
||||||
break;
|
break;
|
||||||
case SDLK_V:
|
case SDLK_V:
|
||||||
set_key_up(e, KEY_TEXT_PASTE);
|
set_key_up(e, KEY_TEXT_PASTE, acceptingTextInput);
|
||||||
break;
|
break;
|
||||||
case SDLK_A:
|
case SDLK_A:
|
||||||
set_key_up(e, KEY_TEXT_SELECTALL);
|
set_key_up(e, KEY_TEXT_SELECTALL, acceptingTextInput);
|
||||||
break;
|
break;
|
||||||
case SDLK_Z:
|
case SDLK_Z:
|
||||||
set_key_up(e, KEY_TEXT_UNDO);
|
set_key_up(e, KEY_TEXT_UNDO, acceptingTextInput);
|
||||||
break;
|
break;
|
||||||
case SDLK_R:
|
case SDLK_R:
|
||||||
set_key_up(e, KEY_TEXT_REDO);
|
set_key_up(e, KEY_TEXT_REDO, acceptingTextInput);
|
||||||
break;
|
break;
|
||||||
case SDLK_RETURN:
|
case SDLK_RETURN:
|
||||||
set_key_up(e, KEY_GENERIC_ENTER);
|
set_key_up(e, KEY_GENERIC_ENTER, acceptingTextInput);
|
||||||
break;
|
break;
|
||||||
case SDLK_TAB:
|
case SDLK_TAB:
|
||||||
set_key_up(e, KEY_TEXT_TAB);
|
set_key_up(e, KEY_TEXT_TAB, acceptingTextInput);
|
||||||
break;
|
break;
|
||||||
case SDLK_ESCAPE:
|
case SDLK_ESCAPE:
|
||||||
set_key_up(e, KEY_GENERIC_ESCAPE);
|
set_key_up(e, KEY_GENERIC_ESCAPE, acceptingTextInput);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
|
|
@ -1035,7 +1039,7 @@ void InputManager::backend_key_up_update(const SDL_KeyboardEvent& e) {
|
||||||
|
|
||||||
for(auto& p : keyAssignments)
|
for(auto& p : keyAssignments)
|
||||||
if(p.first.y() == kPress) // Dont try matching modifiers when setting key to go up
|
if(p.first.y() == kPress) // Dont try matching modifiers when setting key to go up
|
||||||
set_key_up(e, p.second);
|
set_key_up(e, p.second, acceptingTextInput);
|
||||||
}
|
}
|
||||||
|
|
||||||
void InputManager::Mouse::set_pos(const Vector2f& newPos) {
|
void InputManager::Mouse::set_pos(const Vector2f& newPos) {
|
||||||
|
|
|
||||||
|
|
@ -252,8 +252,8 @@ struct InputManager {
|
||||||
|
|
||||||
bool ctrl_or_meta_held();
|
bool ctrl_or_meta_held();
|
||||||
uint32_t make_generic_key_mod(SDL_Keymod m);
|
uint32_t make_generic_key_mod(SDL_Keymod m);
|
||||||
void set_key_up(const SDL_KeyboardEvent& e, KeyCode kCode);
|
void set_key_up(const SDL_KeyboardEvent& e, KeyCode kCode, bool acceptingTextInput);
|
||||||
void set_key_down(const SDL_KeyboardEvent& e, KeyCode kCode);
|
void set_key_down(const SDL_KeyboardEvent& e, KeyCode kCode, bool acceptingTextInput);
|
||||||
std::vector<Vector2f> get_multiple_finger_positions();
|
std::vector<Vector2f> get_multiple_finger_positions();
|
||||||
std::vector<Vector2f> get_multiple_finger_motions();
|
std::vector<Vector2f> get_multiple_finger_motions();
|
||||||
void touch_finger_do_mouse_down();
|
void touch_finger_do_mouse_down();
|
||||||
|
|
|
||||||
|
|
@ -370,6 +370,11 @@ void MainProgram::input_key_callback(const InputManager::KeyCallbackArgs& key) {
|
||||||
toolbar.save_as_func();
|
toolbar.save_as_func();
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
case InputManager::KEY_OPEN_CHAT: {
|
||||||
|
if(key.down && !key.repeat)
|
||||||
|
toolbar.open_chatbox();
|
||||||
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
g.input_key_callback(key);
|
g.input_key_callback(key);
|
||||||
if(world)
|
if(world)
|
||||||
|
|
@ -378,6 +383,13 @@ void MainProgram::input_key_callback(const InputManager::KeyCallbackArgs& key) {
|
||||||
}
|
}
|
||||||
|
|
||||||
void MainProgram::input_text_key_callback(const InputManager::KeyCallbackArgs& key) {
|
void MainProgram::input_text_key_callback(const InputManager::KeyCallbackArgs& key) {
|
||||||
|
switch(key.key) {
|
||||||
|
case InputManager::KEY_GENERIC_ESCAPE: {
|
||||||
|
if(key.down && !key.repeat)
|
||||||
|
toolbar.close_chatbox();
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
g.input_text_key_callback(key);
|
g.input_text_key_callback(key);
|
||||||
if(world)
|
if(world)
|
||||||
world->input_text_key_callback(key);
|
world->input_text_key_callback(key);
|
||||||
|
|
|
||||||
285
src/Toolbar.cpp
285
src/Toolbar.cpp
|
|
@ -16,6 +16,7 @@
|
||||||
#include "MainProgram.hpp"
|
#include "MainProgram.hpp"
|
||||||
#include "InputManager.hpp"
|
#include "InputManager.hpp"
|
||||||
#include "ResourceDisplay/ImageResourceDisplay.hpp"
|
#include "ResourceDisplay/ImageResourceDisplay.hpp"
|
||||||
|
#include "RichText/TextStyleModifier.hpp"
|
||||||
#include "VersionConstants.hpp"
|
#include "VersionConstants.hpp"
|
||||||
#include "World.hpp"
|
#include "World.hpp"
|
||||||
#include <SDL3/SDL_dialog.h>
|
#include <SDL3/SDL_dialog.h>
|
||||||
|
|
@ -52,6 +53,7 @@
|
||||||
#include "GUIStuff/Elements/DropDown.hpp"
|
#include "GUIStuff/Elements/DropDown.hpp"
|
||||||
#include "GUIStuff/Elements/SVGIcon.hpp"
|
#include "GUIStuff/Elements/SVGIcon.hpp"
|
||||||
#include "GUIStuff/Elements/MovableTabList.hpp"
|
#include "GUIStuff/Elements/MovableTabList.hpp"
|
||||||
|
#include "GUIStuff/Elements/TextParagraph.hpp"
|
||||||
|
|
||||||
#define UPDATE_DOWNLOAD_URL "https://infinipaint.com/download.html"
|
#define UPDATE_DOWNLOAD_URL "https://infinipaint.com/download.html"
|
||||||
#define UPDATE_NOTIFICATION_URL "https://infinipaint.com/updateNotificationVersion.txt"
|
#define UPDATE_NOTIFICATION_URL "https://infinipaint.com/updateNotificationVersion.txt"
|
||||||
|
|
@ -257,6 +259,31 @@ void Toolbar::update() {
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
});
|
});
|
||||||
|
if(!chatboxOpen) {
|
||||||
|
for(auto& chatMessage : main.world->chatMessages) {
|
||||||
|
bool wasShown = chatMessage.time < ChatMessage::DISPLAY_TIME;
|
||||||
|
chatMessage.time.update_time_since();
|
||||||
|
bool isShown = chatMessage.time < ChatMessage::DISPLAY_TIME;
|
||||||
|
bool isFading = chatMessage.time >= ChatMessage::FADE_START_TIME;
|
||||||
|
if((isFading && isShown) || (wasShown && !isShown))
|
||||||
|
main.g.gui.set_to_layout();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void Toolbar::open_chatbox() {
|
||||||
|
if(!chatboxOpen) {
|
||||||
|
chatMessageInput.clear();
|
||||||
|
chatboxOpen = true;
|
||||||
|
main.g.gui.set_to_layout();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void Toolbar::close_chatbox() {
|
||||||
|
if(chatboxOpen) {
|
||||||
|
chatboxOpen = false;
|
||||||
|
main.g.gui.set_to_layout();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void Toolbar::layout_run() {
|
void Toolbar::layout_run() {
|
||||||
|
|
@ -1021,149 +1048,139 @@ void Toolbar::layer_menu(Element* layerMenuButton) {
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
std::unique_ptr<skia::textlayout::Paragraph> Toolbar::build_paragraph_from_chat_message(const ChatMessage& message, float alpha) {
|
RichText::TextData Toolbar::build_paragraph_from_chat_message(const ChatMessage& message, float alpha) {
|
||||||
auto& gui = main.g.gui;
|
auto& gui = main.g.gui;
|
||||||
auto& io = gui.io;
|
auto& io = gui.io;
|
||||||
|
|
||||||
skia::textlayout::ParagraphStyle pStyle;
|
RichText::TextData toRet;
|
||||||
pStyle.setTextAlign(skia::textlayout::TextAlign::kLeft);
|
|
||||||
skia::textlayout::TextStyle tStyle;
|
|
||||||
tStyle.setFontSize(io.fontSize);
|
|
||||||
tStyle.setFontFamilies(main.fonts->get_default_font_families());
|
|
||||||
tStyle.setFontStyle(SkFontStyle::Bold());
|
|
||||||
tStyle.setForegroundColor(SkPaint{color_mul_alpha(message.type == ChatMessage::JOIN ? io.theme->warningColor : io.theme->frontColor1, alpha)});
|
|
||||||
pStyle.setTextStyle(tStyle);
|
|
||||||
|
|
||||||
skia::textlayout::ParagraphBuilderImpl a(pStyle, io.fonts->collection, SkUnicodes::ICU::Make());
|
auto& par = toRet.paragraphs.emplace_back();
|
||||||
if(message.type == ChatMessage::JOIN) {
|
|
||||||
std::string messageName = message.name + " ";
|
|
||||||
a.addText(messageName.c_str(), messageName.length());
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
std::string messageName = "[" + message.name + "] ";
|
|
||||||
a.addText(messageName.c_str(), messageName.length());
|
|
||||||
}
|
|
||||||
|
|
||||||
tStyle.setFontStyle(SkFontStyle::Normal());
|
RichText::PositionedTextStyleMod& positionedModInit = toRet.tStyleMods.emplace_back();
|
||||||
a.pushStyle(tStyle);
|
positionedModInit.pos = {0, 0};
|
||||||
a.addText(message.message.c_str(), message.message.length());
|
positionedModInit.mods[RichText::TextStyleModifier::ModifierType::WEIGHT] = std::make_shared<RichText::WeightTextStyleModifier>(SkFontStyle::Weight::kBold_Weight);
|
||||||
|
positionedModInit.mods[RichText::TextStyleModifier::ModifierType::COLOR] = std::make_shared<RichText::ColorTextStyleModifier>(convert_vec4<Vector4f>(color_mul_alpha(message.type == ChatMessage::JOIN ? io.theme->warningColor : io.theme->frontColor1, alpha)));
|
||||||
|
if(message.type == ChatMessage::JOIN)
|
||||||
|
par.text += message.name + " ";
|
||||||
|
else
|
||||||
|
par.text += "[" + message.name + "] ";
|
||||||
|
|
||||||
return a.Build();
|
RichText::PositionedTextStyleMod& positionedModMessage = toRet.tStyleMods.emplace_back();
|
||||||
|
positionedModMessage.pos = {0, par.text.size()};
|
||||||
|
positionedModMessage.mods[RichText::TextStyleModifier::ModifierType::WEIGHT] = std::make_shared<RichText::WeightTextStyleModifier>(SkFontStyle::Weight::kNormal_Weight);
|
||||||
|
par.text += message.message;
|
||||||
|
|
||||||
|
return toRet;
|
||||||
}
|
}
|
||||||
|
|
||||||
void Toolbar::chat_box() {
|
void Toolbar::chat_box() {
|
||||||
//constexpr float CHATBOX_WIDTH = 700;
|
auto& gui = main.g.gui;
|
||||||
//if(main.world->netObjMan.is_connected()) {
|
auto& io = gui.io;
|
||||||
// Clay_ElementId localId = CLAY_ID_LOCAL("INFINIPAINT CHAT BOX OPEN BUTTON");
|
|
||||||
// CLAY(localId, {
|
|
||||||
// .layout = {
|
|
||||||
// .layoutDirection = CLAY_LEFT_TO_RIGHT
|
|
||||||
// },
|
|
||||||
// .floating = {.offset = {static_cast<float>(io.theme->padding1), -static_cast<float>(io.theme->padding1)}, .attachPoints = {.element = CLAY_ATTACH_POINT_LEFT_BOTTOM, .parent = CLAY_ATTACH_POINT_LEFT_BOTTOM}, .attachTo = CLAY_ATTACH_TO_PARENT}
|
|
||||||
// }) {
|
|
||||||
// gui.obstructing_window(localId);
|
|
||||||
// gui.push_id("chat box open button");
|
|
||||||
// if(gui.svg_icon_button("Chat Open Button", "data/icons/chat.svg", chatBoxState != CHATBOXSTATE_CLOSE)) {
|
|
||||||
// if(chatBoxState == CHATBOXSTATE_CLOSE)
|
|
||||||
// chatBoxState = CHATBOXSTATE_JUSTOPEN;
|
|
||||||
// else
|
|
||||||
// chatBoxState = CHATBOXSTATE_CLOSE;
|
|
||||||
// }
|
|
||||||
// gui.pop_id();
|
|
||||||
// }
|
|
||||||
//}
|
|
||||||
//Clay_ElementId localId = CLAY_ID_LOCAL("INFINIPAINT CHAT BOX OPEN");
|
|
||||||
//CLAY(localId, {
|
|
||||||
// .layout = {
|
|
||||||
// .sizing = {.width = CLAY_SIZING_FIXED(CHATBOX_WIDTH), .height = CLAY_SIZING_FIT(0) },
|
|
||||||
// .childGap = 0,
|
|
||||||
// .childAlignment = { .x = CLAY_ALIGN_X_LEFT, .y = CLAY_ALIGN_Y_BOTTOM},
|
|
||||||
// .layoutDirection = CLAY_TOP_TO_BOTTOM
|
|
||||||
// },
|
|
||||||
// .floating = {.offset = {60 + static_cast<float>(io.theme->padding1), -static_cast<float>(io.theme->padding1)}, .attachPoints = {.element = CLAY_ATTACH_POINT_LEFT_BOTTOM, .parent = CLAY_ATTACH_POINT_LEFT_BOTTOM}, .attachTo = CLAY_ATTACH_TO_PARENT}
|
|
||||||
//}) {
|
|
||||||
// gui.obstructing_window(localId);
|
|
||||||
// gui.push_id("chat box");
|
|
||||||
// if(chatBoxState == CHATBOXSTATE_JUSTOPEN || chatBoxState == CHATBOXSTATE_OPEN) {
|
|
||||||
// gui.push_id("messages");
|
|
||||||
// CLAY_AUTO_ID({
|
|
||||||
// .layout = {
|
|
||||||
// .sizing = {.width = CLAY_SIZING_GROW(0), .height = CLAY_SIZING_FIT(0) },
|
|
||||||
// .padding = CLAY_PADDING_ALL(0),
|
|
||||||
// .childGap = 0,
|
|
||||||
// .childAlignment = { .x = CLAY_ALIGN_X_LEFT, .y = CLAY_ALIGN_Y_BOTTOM},
|
|
||||||
// .layoutDirection = CLAY_TOP_TO_BOTTOM
|
|
||||||
// },
|
|
||||||
// .backgroundColor = convert_vec4<Clay_Color>(io.theme->backColor1)
|
|
||||||
// }) {
|
|
||||||
// int id = 0;
|
|
||||||
// for(auto& chatMessage : main.world->chatMessages | std::views::reverse) {
|
|
||||||
// gui.push_id(id);
|
|
||||||
// gui.text_paragraph("text", build_paragraph_from_chat_message(chatMessage, 1.0f), CHATBOX_WIDTH);
|
|
||||||
// gui.pop_id();
|
|
||||||
// id++;
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
// gui.pop_id();
|
|
||||||
|
|
||||||
// gui.left_to_right_line_layout([&]() {
|
constexpr float CHATBOX_WIDTH = 700;
|
||||||
// gui.input_text("message input", &chatMessageInput);
|
if(main.world->netObjMan.is_connected()) {
|
||||||
// if(gui.text_button("send button", "Send", false, true)) {
|
gui.element<LayoutElement>("Infinipaint chat box open button", [&](LayoutElement*, const Clay_ElementId& lId) {
|
||||||
// if(!chatMessageInput.empty())
|
CLAY(lId, {
|
||||||
// main.world->send_chat_message(chatMessageInput);
|
.layout = {
|
||||||
// }
|
.layoutDirection = CLAY_LEFT_TO_RIGHT
|
||||||
// });
|
},
|
||||||
// gui.push_id("message input");
|
.floating = {.offset = {static_cast<float>(io.theme->padding1), -static_cast<float>(io.theme->padding1)}, .zIndex = gui.get_z_index(), .attachPoints = {.element = CLAY_ATTACH_POINT_LEFT_BOTTOM, .parent = CLAY_ATTACH_POINT_LEFT_BOTTOM}, .attachTo = CLAY_ATTACH_TO_PARENT}
|
||||||
// GUIStuff::GUIManager::ElementContainer& a = gui.elements[gui.idStack];
|
}) {
|
||||||
// GUIStuff::TextBox<std::string>& t = *(GUIStuff::TextBox<std::string>*)a.elem.get();
|
svg_icon_button(gui, "Chat open button", "data/icons/chat.svg", {
|
||||||
// gui.pop_id();
|
.onClick = [&] {
|
||||||
// if(chatBoxState == CHATBOXSTATE_JUSTOPEN) {
|
chatboxOpen = !chatboxOpen;
|
||||||
// t.selection.selected = true;
|
chatMessageInput.clear();
|
||||||
// chatBoxState = CHATBOXSTATE_OPEN;
|
}
|
||||||
// }
|
});
|
||||||
// if(io.key.escape)
|
}
|
||||||
// t.selection.selected = false;
|
});
|
||||||
// if(io.key.enter) {
|
}
|
||||||
// main.world->send_chat_message(chatMessageInput);
|
gui.element<LayoutElement>("Infinipaint chat box", [&](LayoutElement*, const Clay_ElementId& lId) {
|
||||||
// t.selection.selected = false;
|
CLAY(lId, {
|
||||||
// }
|
.layout = {
|
||||||
// if(!t.selection.selected) {
|
.sizing = {.width = CLAY_SIZING_FIXED(CHATBOX_WIDTH), .height = CLAY_SIZING_FIT(0) },
|
||||||
// chatMessageInput.clear();
|
.childGap = 0,
|
||||||
// chatBoxState = CHATBOXSTATE_CLOSE;
|
.childAlignment = { .x = CLAY_ALIGN_X_LEFT, .y = CLAY_ALIGN_Y_BOTTOM},
|
||||||
// }
|
.layoutDirection = CLAY_TOP_TO_BOTTOM
|
||||||
// }
|
},
|
||||||
// else {
|
.floating = {.offset = {60 + static_cast<float>(io.theme->padding1), -static_cast<float>(io.theme->padding1)}, .zIndex = gui.get_z_index(), .attachPoints = {.element = CLAY_ATTACH_POINT_LEFT_BOTTOM, .parent = CLAY_ATTACH_POINT_LEFT_BOTTOM}, .attachTo = CLAY_ATTACH_TO_PARENT}
|
||||||
// constexpr float DISPLAY_TIME = 8.0f;
|
}) {
|
||||||
// constexpr float FADE_START_TIME = 7.0f;
|
if(chatboxOpen) {
|
||||||
// gui.push_id("messages popup");
|
CLAY_AUTO_ID({
|
||||||
// int id = 0;
|
.layout = {
|
||||||
// for(auto& chatMessage : main.world->chatMessages | std::views::reverse) {
|
.sizing = {.width = CLAY_SIZING_GROW(0), .height = CLAY_SIZING_FIT(0) },
|
||||||
// chatMessage.time.update_time_since();
|
.padding = CLAY_PADDING_ALL(0),
|
||||||
// if(chatMessage.time < DISPLAY_TIME) {
|
.childGap = 0,
|
||||||
// float a = 1.0f - lerp_time<float>(chatMessage.time, DISPLAY_TIME, FADE_START_TIME);
|
.childAlignment = { .x = CLAY_ALIGN_X_LEFT, .y = CLAY_ALIGN_Y_BOTTOM},
|
||||||
// Clay_ElementId elemId = CLAY_IDI_LOCAL("CHAT MESSAGE ID", id);
|
.layoutDirection = CLAY_TOP_TO_BOTTOM
|
||||||
// CLAY(elemId, {
|
},
|
||||||
// .layout = {
|
.backgroundColor = convert_vec4<Clay_Color>(io.theme->backColor1)
|
||||||
// .sizing = {.width = CLAY_SIZING_GROW(0), .height = CLAY_SIZING_FIT(0) },
|
}) {
|
||||||
// .padding = CLAY_PADDING_ALL(0),
|
int id = 0;
|
||||||
// .childGap = 0,
|
for(auto& chatMessage : main.world->chatMessages | std::views::reverse) {
|
||||||
// .childAlignment = { .x = CLAY_ALIGN_X_LEFT, .y = CLAY_ALIGN_Y_TOP},
|
gui.new_id(id++, [&] {
|
||||||
// .layoutDirection = CLAY_TOP_TO_BOTTOM
|
gui.element<TextParagraph>("text", TextParagraph::Data{
|
||||||
// },
|
.text = build_paragraph_from_chat_message(chatMessage, 1.0f),
|
||||||
// .backgroundColor = convert_vec4<Clay_Color>(color_mul_alpha(io.theme->backColor1, a)),
|
.width = CHATBOX_WIDTH
|
||||||
// }) {
|
});
|
||||||
// gui.push_id(id);
|
});
|
||||||
// gui.obstructing_window(elemId);
|
}
|
||||||
// gui.text_paragraph("text", build_paragraph_from_chat_message(chatMessage, a), CHATBOX_WIDTH);
|
}
|
||||||
// gui.pop_id();
|
|
||||||
// }
|
left_to_right_line_layout(gui, [&] {
|
||||||
// }
|
input_text(gui, "message input", &chatMessageInput, {
|
||||||
// id++;
|
.onEnter = [&] {
|
||||||
// }
|
if(!chatMessageInput.empty())
|
||||||
// gui.pop_id();
|
main.world->send_chat_message(chatMessageInput);
|
||||||
// }
|
chatboxOpen = false;
|
||||||
// gui.pop_id();
|
},
|
||||||
//}
|
.onDeselect = [&] {
|
||||||
|
chatboxOpen = false;
|
||||||
|
gui.set_to_layout();
|
||||||
|
}
|
||||||
|
})->select();
|
||||||
|
text_button(gui, "send button", "Send", {
|
||||||
|
.instantResponse = true,
|
||||||
|
.onClick = [&] {
|
||||||
|
if(!chatMessageInput.empty())
|
||||||
|
main.world->send_chat_message(chatMessageInput);
|
||||||
|
chatboxOpen = false;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
gui.new_id("Message popups", [&] {
|
||||||
|
int id = 0;
|
||||||
|
for(auto& chatMessage : main.world->chatMessages | std::views::reverse) {
|
||||||
|
chatMessage.time.update_time_since();
|
||||||
|
if(chatMessage.time < ChatMessage::DISPLAY_TIME) {
|
||||||
|
gui.new_id(id++, [&] {
|
||||||
|
float a = 1.0f - lerp_time<float>(chatMessage.time, ChatMessage::DISPLAY_TIME, ChatMessage::FADE_START_TIME);
|
||||||
|
gui.element<LayoutElement>("Chat message", [&](LayoutElement*, const Clay_ElementId& lId) {
|
||||||
|
CLAY(lId, {
|
||||||
|
.layout = {
|
||||||
|
.sizing = {.width = CLAY_SIZING_GROW(0), .height = CLAY_SIZING_FIT(0) },
|
||||||
|
.padding = CLAY_PADDING_ALL(0),
|
||||||
|
.childGap = 0,
|
||||||
|
.childAlignment = { .x = CLAY_ALIGN_X_LEFT, .y = CLAY_ALIGN_Y_TOP},
|
||||||
|
.layoutDirection = CLAY_TOP_TO_BOTTOM
|
||||||
|
},
|
||||||
|
.backgroundColor = convert_vec4<Clay_Color>(color_mul_alpha(io.theme->backColor1, a)),
|
||||||
|
}) {
|
||||||
|
gui.element<TextParagraph>("message", TextParagraph::Data{
|
||||||
|
.text = build_paragraph_from_chat_message(chatMessage, a),
|
||||||
|
.width = CHATBOX_WIDTH
|
||||||
|
});
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
void Toolbar::global_log() {
|
void Toolbar::global_log() {
|
||||||
|
|
@ -2136,7 +2153,7 @@ void Toolbar::file_picker_gui() {
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
input_path_field(gui, "file picker path", "Path", &filePicker.currentSearchPath, {
|
input_path_field(gui, "file picker path", "Path", &filePicker.currentSearchPath, {
|
||||||
.updateEveryEdit = false,
|
.fileTypeRestriction = std::filesystem::file_type::directory,
|
||||||
.onEdit = [&] {
|
.onEdit = [&] {
|
||||||
file_picker_gui_refresh_entries();
|
file_picker_gui_refresh_entries();
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,6 @@
|
||||||
#pragma once
|
#pragma once
|
||||||
#include "GUIStuff/Elements/ScrollArea.hpp"
|
#include "GUIStuff/Elements/ScrollArea.hpp"
|
||||||
|
#include "GUIStuff/Elements/TextParagraph.hpp"
|
||||||
#include "GUIStuff/GUIManager.hpp"
|
#include "GUIStuff/GUIManager.hpp"
|
||||||
#include "DrawData.hpp"
|
#include "DrawData.hpp"
|
||||||
#include "Helpers/FileDownloader.hpp"
|
#include "Helpers/FileDownloader.hpp"
|
||||||
|
|
@ -26,6 +27,8 @@ class Toolbar {
|
||||||
};
|
};
|
||||||
|
|
||||||
struct ChatMessage {
|
struct ChatMessage {
|
||||||
|
static constexpr float DISPLAY_TIME = 8.0f;
|
||||||
|
static constexpr float FADE_START_TIME = 7.0f;
|
||||||
std::string name;
|
std::string name;
|
||||||
std::string message;
|
std::string message;
|
||||||
enum Type {
|
enum Type {
|
||||||
|
|
@ -73,6 +76,9 @@ class Toolbar {
|
||||||
void load_palettes();
|
void load_palettes();
|
||||||
void load_licenses();
|
void load_licenses();
|
||||||
|
|
||||||
|
void open_chatbox();
|
||||||
|
void close_chatbox();
|
||||||
|
|
||||||
GUIStuff::Element* colorLeftButton;
|
GUIStuff::Element* colorLeftButton;
|
||||||
Vector4f* colorLeft = nullptr;
|
Vector4f* colorLeft = nullptr;
|
||||||
ColorSelectorData colorLeftData;
|
ColorSelectorData colorLeftData;
|
||||||
|
|
@ -171,11 +177,7 @@ class Toolbar {
|
||||||
|
|
||||||
float finalCalculatedGuiScale = 1.0f;
|
float finalCalculatedGuiScale = 1.0f;
|
||||||
|
|
||||||
enum {
|
bool chatboxOpen = false;
|
||||||
CHATBOXSTATE_OPEN,
|
|
||||||
CHATBOXSTATE_JUSTOPEN,
|
|
||||||
CHATBOXSTATE_CLOSE
|
|
||||||
} chatBoxState = CHATBOXSTATE_CLOSE;
|
|
||||||
|
|
||||||
enum OptionsMenuType {
|
enum OptionsMenuType {
|
||||||
HOST_MENU,
|
HOST_MENU,
|
||||||
|
|
@ -226,7 +228,7 @@ class Toolbar {
|
||||||
};
|
};
|
||||||
static NativeFilePicker nativeFilePicker;
|
static NativeFilePicker nativeFilePicker;
|
||||||
|
|
||||||
std::unique_ptr<skia::textlayout::Paragraph> build_paragraph_from_chat_message(const ChatMessage& message, float alpha);
|
RichText::TextData build_paragraph_from_chat_message(const ChatMessage& message, float alpha);
|
||||||
|
|
||||||
void load_icons_at(const std::filesystem::path& pathToLoad);
|
void load_icons_at(const std::filesystem::path& pathToLoad);
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue