Fixed color display and global log bugs
This commit is contained in:
parent
c6e2ce5293
commit
f5d757a9a5
4 changed files with 51 additions and 48 deletions
|
|
@ -18,7 +18,7 @@ template <typename T, typename OptT> TextBoxData<T> textbox_options_to_data(cons
|
||||||
}
|
}
|
||||||
|
|
||||||
struct TextBoxOptions {
|
struct TextBoxOptions {
|
||||||
bool updateEveryEdit = false;
|
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 +28,7 @@ struct TextBoxOptions {
|
||||||
|
|
||||||
struct TextBoxScalarOptions {
|
struct TextBoxScalarOptions {
|
||||||
int decimalPrecision = 0;
|
int decimalPrecision = 0;
|
||||||
bool updateEveryEdit = false;
|
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 +38,7 @@ struct TextBoxScalarOptions {
|
||||||
|
|
||||||
struct TextBoxScalarsOptions {
|
struct TextBoxScalarsOptions {
|
||||||
int decimalPrecision = 0;
|
int decimalPrecision = 0;
|
||||||
bool updateEveryEdit = false;
|
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 +48,7 @@ struct TextBoxScalarsOptions {
|
||||||
|
|
||||||
struct TextBoxPathOptions {
|
struct TextBoxPathOptions {
|
||||||
std::filesystem::file_type fileTypeRestriction;
|
std::filesystem::file_type fileTypeRestriction;
|
||||||
bool updateEveryEdit = false;
|
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 +58,7 @@ struct TextBoxPathOptions {
|
||||||
|
|
||||||
struct TextBoxHexColorOptions {
|
struct TextBoxHexColorOptions {
|
||||||
bool hasAlpha = true;
|
bool hasAlpha = true;
|
||||||
bool updateEveryEdit = false;
|
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;
|
||||||
|
|
|
||||||
|
|
@ -14,7 +14,7 @@ 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 = false;
|
bool updateEveryEdit = true;
|
||||||
bool immutable = false;
|
bool immutable = false;
|
||||||
InputManager::TextInputProperties textInputProps;
|
InputManager::TextInputProperties textInputProps;
|
||||||
std::function<void()> onEdit;
|
std::function<void()> onEdit;
|
||||||
|
|
|
||||||
|
|
@ -91,7 +91,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(update_data() && userInfo.onEdit)
|
if(userInfo.updateEveryEdit && update_data() && userInfo.onEdit)
|
||||||
gui.set_post_callback_func_high_priority(userInfo.onEdit);
|
gui.set_post_callback_func_high_priority(userInfo.onEdit);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1170,6 +1170,7 @@ void Toolbar::global_log() {
|
||||||
auto& gui = main.g.gui;
|
auto& gui = main.g.gui;
|
||||||
auto& io = gui.io;
|
auto& io = gui.io;
|
||||||
|
|
||||||
|
gui.new_id("Global log popup list", [&] {
|
||||||
CLAY_AUTO_ID({
|
CLAY_AUTO_ID({
|
||||||
.layout = {
|
.layout = {
|
||||||
.sizing = {.width = CLAY_SIZING_FIXED(300), .height = CLAY_SIZING_FIT(0) },
|
.sizing = {.width = CLAY_SIZING_FIXED(300), .height = CLAY_SIZING_FIT(0) },
|
||||||
|
|
@ -1179,13 +1180,13 @@ void Toolbar::global_log() {
|
||||||
},
|
},
|
||||||
.floating = {.offset = {0, 10}, .attachPoints = {.element = CLAY_ATTACH_POINT_RIGHT_TOP, .parent = CLAY_ATTACH_POINT_RIGHT_BOTTOM}, .attachTo = CLAY_ATTACH_TO_PARENT}
|
.floating = {.offset = {0, 10}, .attachPoints = {.element = CLAY_ATTACH_POINT_RIGHT_TOP, .parent = CLAY_ATTACH_POINT_RIGHT_BOTTOM}, .attachTo = CLAY_ATTACH_TO_PARENT}
|
||||||
}) {
|
}) {
|
||||||
int i = 0;
|
for(size_t i = 0; i < main.logMessages.size(); i++) {
|
||||||
for(auto& logM : main.logMessages) {
|
auto& logM = main.logMessages[i];
|
||||||
logM.time.update_time_since();
|
logM.time.update_time_since();
|
||||||
if(logM.time < LogMessage::DISPLAY_TIME) {
|
if(logM.time < LogMessage::DISPLAY_TIME) {
|
||||||
float a = 1.0f - lerp_time<float>(logM.time, LogMessage::DISPLAY_TIME, LogMessage::FADE_START_TIME);
|
float a = 1.0f - lerp_time<float>(logM.time, LogMessage::DISPLAY_TIME, LogMessage::FADE_START_TIME);
|
||||||
gui.new_id(i, [&] {
|
gui.new_id(i, [&] {
|
||||||
gui.element<LayoutElement>("GLOBAL LOG", [&] (LayoutElement*, const Clay_ElementId& lId) {
|
gui.element<LayoutElement>("Global log message", [&] (LayoutElement*, const Clay_ElementId& lId) {
|
||||||
CLAY(lId, {
|
CLAY(lId, {
|
||||||
.layout = {
|
.layout = {
|
||||||
.sizing = {.width = CLAY_SIZING_FIT(300), .height = CLAY_SIZING_FIT(0) },
|
.sizing = {.width = CLAY_SIZING_FIT(300), .height = CLAY_SIZING_FIT(0) },
|
||||||
|
|
@ -1215,6 +1216,7 @@ void Toolbar::global_log() {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
void Toolbar::drawing_program_gui() {
|
void Toolbar::drawing_program_gui() {
|
||||||
|
|
@ -2131,6 +2133,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,
|
||||||
.onEdit = [&] {
|
.onEdit = [&] {
|
||||||
file_picker_gui_refresh_entries();
|
file_picker_gui_refresh_entries();
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue