Layout element is not used in toolbar screen fill
This commit is contained in:
parent
74bc17f570
commit
f1d7cbf896
5 changed files with 371 additions and 350 deletions
|
|
@ -51,146 +51,144 @@ void left_to_right_line_centered_layout(GUIManager& gui, const std::function<voi
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void window_fill_side_bar(GUIManager& gui, const char* id, const WindowFillSideBarConfig& config, const std::function<void()>& innerContent) {
|
void window_fill_side_bar(GUIManager& gui, const WindowFillSideBarConfig& config, const std::function<void()>& innerContent) {
|
||||||
gui.element<LayoutElement>(id, [&](LayoutElement* l, const Clay_ElementId& lId) {
|
switch(config.dir) {
|
||||||
switch(config.dir) {
|
case WindowFillSideBarConfig::Direction::TOP: {
|
||||||
case WindowFillSideBarConfig::Direction::TOP: {
|
CLAY_AUTO_ID({
|
||||||
CLAY(lId, {
|
.layout = {
|
||||||
|
.sizing = {.width = CLAY_SIZING_GROW(0), .height = CLAY_SIZING_FIT(0) },
|
||||||
|
.layoutDirection = CLAY_TOP_TO_BOTTOM
|
||||||
|
},
|
||||||
|
.backgroundColor = convert_vec4<Clay_Color>(config.backgroundColor),
|
||||||
|
.border = config.border
|
||||||
|
}) {
|
||||||
|
CLAY_AUTO_ID({
|
||||||
|
.layout = {.sizing = {.width = CLAY_SIZING_GROW(0), .height = CLAY_SIZING_FIXED(gui.io.safeWindowRect.min.y())}}
|
||||||
|
}) {}
|
||||||
|
CLAY_AUTO_ID({
|
||||||
.layout = {
|
.layout = {
|
||||||
.sizing = {.width = CLAY_SIZING_GROW(0), .height = CLAY_SIZING_FIT(0) },
|
.sizing = {.width = CLAY_SIZING_GROW(0), .height = CLAY_SIZING_FIT(0) },
|
||||||
.layoutDirection = CLAY_TOP_TO_BOTTOM
|
|
||||||
},
|
|
||||||
.backgroundColor = convert_vec4<Clay_Color>(config.backgroundColor),
|
|
||||||
.border = config.border
|
|
||||||
}) {
|
|
||||||
CLAY_AUTO_ID({
|
|
||||||
.layout = {.sizing = {.width = CLAY_SIZING_GROW(0), .height = CLAY_SIZING_FIXED(gui.io.safeWindowRect.min.y())}}
|
|
||||||
}) {}
|
|
||||||
CLAY_AUTO_ID({
|
|
||||||
.layout = {
|
|
||||||
.sizing = {.width = CLAY_SIZING_GROW(0), .height = CLAY_SIZING_FIT(0) },
|
|
||||||
.layoutDirection = CLAY_LEFT_TO_RIGHT
|
|
||||||
}
|
|
||||||
}) {
|
|
||||||
CLAY_AUTO_ID({
|
|
||||||
.layout = {.sizing = {.width = CLAY_SIZING_FIXED(gui.io.safeWindowRect.min.x()), .height = CLAY_SIZING_FIT(0)}}
|
|
||||||
}) {}
|
|
||||||
CLAY_AUTO_ID({
|
|
||||||
.layout = {.sizing = {.width = CLAY_SIZING_FIXED(gui.io.safeWindowRect.width()), .height = CLAY_SIZING_FIT(0)}}
|
|
||||||
}) {
|
|
||||||
innerContent();
|
|
||||||
}
|
|
||||||
CLAY_AUTO_ID({
|
|
||||||
.layout = {.sizing = {.width = CLAY_SIZING_FIXED(gui.io.windowSize.x() - gui.io.safeWindowRect.max.x()), .height = CLAY_SIZING_FIT(0)}}
|
|
||||||
}) {}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
case WindowFillSideBarConfig::Direction::BOTTOM: {
|
|
||||||
CLAY(lId, {
|
|
||||||
.layout = {
|
|
||||||
.sizing = {.width = CLAY_SIZING_GROW(0), .height = CLAY_SIZING_FIT(0) },
|
|
||||||
.layoutDirection = CLAY_TOP_TO_BOTTOM
|
|
||||||
},
|
|
||||||
.backgroundColor = convert_vec4<Clay_Color>(config.backgroundColor),
|
|
||||||
.border = config.border
|
|
||||||
}) {
|
|
||||||
CLAY_AUTO_ID({
|
|
||||||
.layout = {
|
|
||||||
.sizing = {.width = CLAY_SIZING_GROW(0), .height = CLAY_SIZING_FIT(0) },
|
|
||||||
.layoutDirection = CLAY_LEFT_TO_RIGHT
|
|
||||||
}
|
|
||||||
}) {
|
|
||||||
CLAY_AUTO_ID({
|
|
||||||
.layout = {.sizing = {.width = CLAY_SIZING_FIXED(gui.io.safeWindowRect.min.x()), .height = CLAY_SIZING_FIT(0)}}
|
|
||||||
}) {}
|
|
||||||
CLAY_AUTO_ID({
|
|
||||||
.layout = {.sizing = {.width = CLAY_SIZING_FIXED(gui.io.safeWindowRect.width()), .height = CLAY_SIZING_FIT(0)}}
|
|
||||||
}) {
|
|
||||||
innerContent();
|
|
||||||
}
|
|
||||||
CLAY_AUTO_ID({
|
|
||||||
.layout = {.sizing = {.width = CLAY_SIZING_FIXED(gui.io.windowSize.x() - gui.io.safeWindowRect.max.x()), .height = CLAY_SIZING_FIT(0)}}
|
|
||||||
}) {}
|
|
||||||
}
|
|
||||||
CLAY_AUTO_ID({
|
|
||||||
.layout = {.sizing = {.width = CLAY_SIZING_GROW(0), .height = CLAY_SIZING_FIXED(gui.io.windowSize.y() - gui.io.safeWindowRect.max.y())}}
|
|
||||||
}) {}
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
case WindowFillSideBarConfig::Direction::LEFT: {
|
|
||||||
CLAY(lId, {
|
|
||||||
.layout = {
|
|
||||||
.sizing = {.width = CLAY_SIZING_FIT(0), .height = CLAY_SIZING_GROW(0) },
|
|
||||||
.layoutDirection = CLAY_LEFT_TO_RIGHT
|
.layoutDirection = CLAY_LEFT_TO_RIGHT
|
||||||
},
|
}
|
||||||
.backgroundColor = convert_vec4<Clay_Color>(config.backgroundColor),
|
|
||||||
.border = config.border
|
|
||||||
}) {
|
}) {
|
||||||
CLAY_AUTO_ID({
|
CLAY_AUTO_ID({
|
||||||
.layout = {.sizing = {.width = CLAY_SIZING_FIXED(gui.io.safeWindowRect.min.x()), .height = CLAY_SIZING_GROW(0)}}
|
.layout = {.sizing = {.width = CLAY_SIZING_FIXED(gui.io.safeWindowRect.min.x()), .height = CLAY_SIZING_FIT(0)}}
|
||||||
}) {}
|
}) {}
|
||||||
CLAY_AUTO_ID({
|
CLAY_AUTO_ID({
|
||||||
.layout = {
|
.layout = {.sizing = {.width = CLAY_SIZING_FIXED(gui.io.safeWindowRect.width()), .height = CLAY_SIZING_FIT(0)}}
|
||||||
.sizing = {.width = CLAY_SIZING_FIT(0), .height = CLAY_SIZING_GROW(0) },
|
|
||||||
.layoutDirection = CLAY_TOP_TO_BOTTOM
|
|
||||||
}
|
|
||||||
}) {
|
}) {
|
||||||
CLAY_AUTO_ID({
|
innerContent();
|
||||||
.layout = {.sizing = {.width = CLAY_SIZING_FIT(0), .height = CLAY_SIZING_FIXED(gui.io.safeWindowRect.min.y())}}
|
|
||||||
}) {}
|
|
||||||
CLAY_AUTO_ID({
|
|
||||||
.layout = {.sizing = {.width = CLAY_SIZING_FIT(0), .height = CLAY_SIZING_FIXED(gui.io.safeWindowRect.height())}}
|
|
||||||
}) {
|
|
||||||
innerContent();
|
|
||||||
}
|
|
||||||
CLAY_AUTO_ID({
|
|
||||||
.layout = {.sizing = {.width = CLAY_SIZING_FIT(0), .height = CLAY_SIZING_FIXED(gui.io.windowSize.y() - gui.io.safeWindowRect.max.y())}}
|
|
||||||
}) {}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
case WindowFillSideBarConfig::Direction::RIGHT: {
|
|
||||||
CLAY(lId, {
|
|
||||||
.layout = {
|
|
||||||
.sizing = {.width = CLAY_SIZING_FIT(0), .height = CLAY_SIZING_GROW(0) },
|
|
||||||
.layoutDirection = CLAY_LEFT_TO_RIGHT
|
|
||||||
},
|
|
||||||
.backgroundColor = convert_vec4<Clay_Color>(config.backgroundColor),
|
|
||||||
.border = config.border
|
|
||||||
}) {
|
|
||||||
CLAY_AUTO_ID({
|
|
||||||
.layout = {
|
|
||||||
.sizing = {.width = CLAY_SIZING_FIT(0), .height = CLAY_SIZING_GROW(0) },
|
|
||||||
.layoutDirection = CLAY_TOP_TO_BOTTOM
|
|
||||||
}
|
|
||||||
}) {
|
|
||||||
CLAY_AUTO_ID({
|
|
||||||
.layout = {.sizing = {.width = CLAY_SIZING_FIT(0), .height = CLAY_SIZING_FIXED(gui.io.safeWindowRect.min.y())}}
|
|
||||||
}) {}
|
|
||||||
CLAY_AUTO_ID({
|
|
||||||
.layout = {.sizing = {.width = CLAY_SIZING_FIT(0), .height = CLAY_SIZING_FIXED(gui.io.safeWindowRect.height())}}
|
|
||||||
}) {
|
|
||||||
innerContent();
|
|
||||||
}
|
|
||||||
CLAY_AUTO_ID({
|
|
||||||
.layout = {.sizing = {.width = CLAY_SIZING_FIT(0), .height = CLAY_SIZING_FIXED(gui.io.windowSize.y() - gui.io.safeWindowRect.max.y())}}
|
|
||||||
}) {}
|
|
||||||
}
|
}
|
||||||
CLAY_AUTO_ID({
|
CLAY_AUTO_ID({
|
||||||
.layout = {.sizing = {.width = CLAY_SIZING_FIXED(gui.io.windowSize.x() - gui.io.safeWindowRect.max.x()), .height = CLAY_SIZING_GROW(0)}}
|
.layout = {.sizing = {.width = CLAY_SIZING_FIXED(gui.io.windowSize.x() - gui.io.safeWindowRect.max.x()), .height = CLAY_SIZING_FIT(0)}}
|
||||||
}) {}
|
}) {}
|
||||||
}
|
}
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
});
|
case WindowFillSideBarConfig::Direction::BOTTOM: {
|
||||||
|
CLAY_AUTO_ID({
|
||||||
|
.layout = {
|
||||||
|
.sizing = {.width = CLAY_SIZING_GROW(0), .height = CLAY_SIZING_FIT(0) },
|
||||||
|
.layoutDirection = CLAY_TOP_TO_BOTTOM
|
||||||
|
},
|
||||||
|
.backgroundColor = convert_vec4<Clay_Color>(config.backgroundColor),
|
||||||
|
.border = config.border
|
||||||
|
}) {
|
||||||
|
CLAY_AUTO_ID({
|
||||||
|
.layout = {
|
||||||
|
.sizing = {.width = CLAY_SIZING_GROW(0), .height = CLAY_SIZING_FIT(0) },
|
||||||
|
.layoutDirection = CLAY_LEFT_TO_RIGHT
|
||||||
|
}
|
||||||
|
}) {
|
||||||
|
CLAY_AUTO_ID({
|
||||||
|
.layout = {.sizing = {.width = CLAY_SIZING_FIXED(gui.io.safeWindowRect.min.x()), .height = CLAY_SIZING_FIT(0)}}
|
||||||
|
}) {}
|
||||||
|
CLAY_AUTO_ID({
|
||||||
|
.layout = {.sizing = {.width = CLAY_SIZING_FIXED(gui.io.safeWindowRect.width()), .height = CLAY_SIZING_FIT(0)}}
|
||||||
|
}) {
|
||||||
|
innerContent();
|
||||||
|
}
|
||||||
|
CLAY_AUTO_ID({
|
||||||
|
.layout = {.sizing = {.width = CLAY_SIZING_FIXED(gui.io.windowSize.x() - gui.io.safeWindowRect.max.x()), .height = CLAY_SIZING_FIT(0)}}
|
||||||
|
}) {}
|
||||||
|
}
|
||||||
|
CLAY_AUTO_ID({
|
||||||
|
.layout = {.sizing = {.width = CLAY_SIZING_GROW(0), .height = CLAY_SIZING_FIXED(gui.io.windowSize.y() - gui.io.safeWindowRect.max.y())}}
|
||||||
|
}) {}
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case WindowFillSideBarConfig::Direction::LEFT: {
|
||||||
|
CLAY_AUTO_ID({
|
||||||
|
.layout = {
|
||||||
|
.sizing = {.width = CLAY_SIZING_FIT(0), .height = CLAY_SIZING_GROW(0) },
|
||||||
|
.layoutDirection = CLAY_LEFT_TO_RIGHT
|
||||||
|
},
|
||||||
|
.backgroundColor = convert_vec4<Clay_Color>(config.backgroundColor),
|
||||||
|
.border = config.border
|
||||||
|
}) {
|
||||||
|
CLAY_AUTO_ID({
|
||||||
|
.layout = {.sizing = {.width = CLAY_SIZING_FIXED(gui.io.safeWindowRect.min.x()), .height = CLAY_SIZING_GROW(0)}}
|
||||||
|
}) {}
|
||||||
|
CLAY_AUTO_ID({
|
||||||
|
.layout = {
|
||||||
|
.sizing = {.width = CLAY_SIZING_FIT(0), .height = CLAY_SIZING_GROW(0) },
|
||||||
|
.layoutDirection = CLAY_TOP_TO_BOTTOM
|
||||||
|
}
|
||||||
|
}) {
|
||||||
|
CLAY_AUTO_ID({
|
||||||
|
.layout = {.sizing = {.width = CLAY_SIZING_FIT(0), .height = CLAY_SIZING_FIXED(gui.io.safeWindowRect.min.y())}}
|
||||||
|
}) {}
|
||||||
|
CLAY_AUTO_ID({
|
||||||
|
.layout = {.sizing = {.width = CLAY_SIZING_FIT(0), .height = CLAY_SIZING_FIXED(gui.io.safeWindowRect.height())}}
|
||||||
|
}) {
|
||||||
|
innerContent();
|
||||||
|
}
|
||||||
|
CLAY_AUTO_ID({
|
||||||
|
.layout = {.sizing = {.width = CLAY_SIZING_FIT(0), .height = CLAY_SIZING_FIXED(gui.io.windowSize.y() - gui.io.safeWindowRect.max.y())}}
|
||||||
|
}) {}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case WindowFillSideBarConfig::Direction::RIGHT: {
|
||||||
|
CLAY_AUTO_ID({
|
||||||
|
.layout = {
|
||||||
|
.sizing = {.width = CLAY_SIZING_FIT(0), .height = CLAY_SIZING_GROW(0) },
|
||||||
|
.layoutDirection = CLAY_LEFT_TO_RIGHT
|
||||||
|
},
|
||||||
|
.backgroundColor = convert_vec4<Clay_Color>(config.backgroundColor),
|
||||||
|
.border = config.border
|
||||||
|
}) {
|
||||||
|
CLAY_AUTO_ID({
|
||||||
|
.layout = {
|
||||||
|
.sizing = {.width = CLAY_SIZING_FIT(0), .height = CLAY_SIZING_GROW(0) },
|
||||||
|
.layoutDirection = CLAY_TOP_TO_BOTTOM
|
||||||
|
}
|
||||||
|
}) {
|
||||||
|
CLAY_AUTO_ID({
|
||||||
|
.layout = {.sizing = {.width = CLAY_SIZING_FIT(0), .height = CLAY_SIZING_FIXED(gui.io.safeWindowRect.min.y())}}
|
||||||
|
}) {}
|
||||||
|
CLAY_AUTO_ID({
|
||||||
|
.layout = {.sizing = {.width = CLAY_SIZING_FIT(0), .height = CLAY_SIZING_FIXED(gui.io.safeWindowRect.height())}}
|
||||||
|
}) {
|
||||||
|
innerContent();
|
||||||
|
}
|
||||||
|
CLAY_AUTO_ID({
|
||||||
|
.layout = {.sizing = {.width = CLAY_SIZING_FIT(0), .height = CLAY_SIZING_FIXED(gui.io.windowSize.y() - gui.io.safeWindowRect.max.y())}}
|
||||||
|
}) {}
|
||||||
|
}
|
||||||
|
CLAY_AUTO_ID({
|
||||||
|
.layout = {.sizing = {.width = CLAY_SIZING_FIXED(gui.io.windowSize.x() - gui.io.safeWindowRect.max.x()), .height = CLAY_SIZING_GROW(0)}}
|
||||||
|
}) {}
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void window_gap_side_bar(GUIManager& gui, const char* id, const WindowFillSideBarConfig::Direction& dir) {
|
void window_gap_side_bar(GUIManager& gui, const WindowFillSideBarConfig::Direction& dir) {
|
||||||
switch(dir) {
|
switch(dir) {
|
||||||
case WindowFillSideBarConfig::Direction::TOP:
|
case WindowFillSideBarConfig::Direction::TOP:
|
||||||
CLAY_AUTO_ID({
|
CLAY_AUTO_ID({
|
||||||
|
|
|
||||||
|
|
@ -20,7 +20,7 @@ struct WindowFillSideBarConfig {
|
||||||
Clay_BorderElementConfig border;
|
Clay_BorderElementConfig border;
|
||||||
};
|
};
|
||||||
|
|
||||||
void window_fill_side_bar(GUIManager& gui, const char* id, const WindowFillSideBarConfig& config, const std::function<void()>& innerContent);
|
void window_fill_side_bar(GUIManager& gui, const WindowFillSideBarConfig& config, const std::function<void()>& innerContent);
|
||||||
void window_gap_side_bar(GUIManager& gui, const char* id, const WindowFillSideBarConfig::Direction& dir);
|
void window_gap_side_bar(GUIManager& gui, const WindowFillSideBarConfig::Direction& dir);
|
||||||
|
|
||||||
}}
|
}}
|
||||||
|
|
|
||||||
|
|
@ -153,7 +153,7 @@ void FileSelectScreen::main_display() {
|
||||||
.layoutDirection = CLAY_LEFT_TO_RIGHT
|
.layoutDirection = CLAY_LEFT_TO_RIGHT
|
||||||
},
|
},
|
||||||
}) {
|
}) {
|
||||||
window_gap_side_bar(gui, "main display left fill", WindowFillSideBarConfig::Direction::LEFT);
|
window_gap_side_bar(gui, WindowFillSideBarConfig::Direction::LEFT);
|
||||||
CLAY_AUTO_ID({
|
CLAY_AUTO_ID({
|
||||||
.layout = {
|
.layout = {
|
||||||
.sizing = {.width = CLAY_SIZING_GROW(0), .height = CLAY_SIZING_GROW(0)},
|
.sizing = {.width = CLAY_SIZING_GROW(0), .height = CLAY_SIZING_GROW(0)},
|
||||||
|
|
@ -175,9 +175,9 @@ void FileSelectScreen::main_display() {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
window_gap_side_bar(gui, "main display right fill", WindowFillSideBarConfig::Direction::RIGHT);
|
window_gap_side_bar(gui, WindowFillSideBarConfig::Direction::RIGHT);
|
||||||
}
|
}
|
||||||
window_gap_side_bar(gui, "main display bottom fill", WindowFillSideBarConfig::Direction::BOTTOM);
|
window_gap_side_bar(gui, WindowFillSideBarConfig::Direction::BOTTOM);
|
||||||
edit_action_bar();
|
edit_action_bar();
|
||||||
menu_black_box();
|
menu_black_box();
|
||||||
}
|
}
|
||||||
|
|
@ -334,46 +334,50 @@ void FileSelectScreen::edit_action_bar() {
|
||||||
CLAY_AUTO_ID({
|
CLAY_AUTO_ID({
|
||||||
.layout = { .sizing = {.width = CLAY_SIZING_GROW(0), .height = CLAY_SIZING_GROW(0)}},
|
.layout = { .sizing = {.width = CLAY_SIZING_GROW(0), .height = CLAY_SIZING_GROW(0)}},
|
||||||
}) {}
|
}) {}
|
||||||
window_fill_side_bar(gui, "edit action bar bottom fill", {
|
gui.element<LayoutElement>("edit action bar bottom fill", [&](LayoutElement*, const Clay_ElementId& lId) {
|
||||||
.dir = WindowFillSideBarConfig::Direction::BOTTOM,
|
CLAY(lId, {}) {
|
||||||
.backgroundColor = gui.io.theme->backColor1
|
window_fill_side_bar(gui, {
|
||||||
}, [&] {
|
.dir = WindowFillSideBarConfig::Direction::BOTTOM,
|
||||||
gui.element<LayoutElement>("edit action bar", [&](LayoutElement*, const Clay_ElementId& lId) {
|
.backgroundColor = gui.io.theme->backColor1
|
||||||
CLAY(lId, {
|
}, [&] {
|
||||||
.layout = {
|
gui.element<LayoutElement>("edit action bar", [&](LayoutElement*, const Clay_ElementId& lId) {
|
||||||
.sizing = {.width = CLAY_SIZING_GROW(0), .height = CLAY_SIZING_FIXED(50 * actionBarOpenAnim->get_val())},
|
CLAY(lId, {
|
||||||
.childAlignment = { .x = CLAY_ALIGN_X_CENTER, .y = CLAY_ALIGN_Y_CENTER },
|
.layout = {
|
||||||
.layoutDirection = CLAY_LEFT_TO_RIGHT,
|
.sizing = {.width = CLAY_SIZING_GROW(0), .height = CLAY_SIZING_FIXED(50 * actionBarOpenAnim->get_val())},
|
||||||
}
|
.childAlignment = { .x = CLAY_ALIGN_X_CENTER, .y = CLAY_ALIGN_Y_CENTER },
|
||||||
}) {
|
.layoutDirection = CLAY_LEFT_TO_RIGHT,
|
||||||
if(actionBarOpenAnim->is_at_end()) {
|
}
|
||||||
if(selectedMenu == SelectedMenu::FILES) {
|
}) {
|
||||||
edit_action_bar_button("trash", "data/icons/trash.svg", "Trash", [&] {
|
if(actionBarOpenAnim->is_at_end()) {
|
||||||
move_selected_files(savePath, trashPath, TrashMoveType::MOVE_TO_TRASH);
|
if(selectedMenu == SelectedMenu::FILES) {
|
||||||
update_file_list(fileList, savePath, false);
|
edit_action_bar_button("trash", "data/icons/trash.svg", "Trash", [&] {
|
||||||
editMode = false;
|
move_selected_files(savePath, trashPath, TrashMoveType::MOVE_TO_TRASH);
|
||||||
});
|
update_file_list(fileList, savePath, false);
|
||||||
edit_action_bar_button("duplicate", "data/icons/RemixIcon/file-copy-line.svg", "Duplicate", [&] {
|
editMode = false;
|
||||||
duplicate_selected_files(savePath);
|
});
|
||||||
update_file_list(fileList, savePath, false);
|
edit_action_bar_button("duplicate", "data/icons/RemixIcon/file-copy-line.svg", "Duplicate", [&] {
|
||||||
editMode = false;
|
duplicate_selected_files(savePath);
|
||||||
});
|
update_file_list(fileList, savePath, false);
|
||||||
|
editMode = false;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
else if(selectedMenu == SelectedMenu::TRASH) {
|
||||||
|
edit_action_bar_button("restore", "data/icons/RemixIcon/refresh-line.svg", "Restore", [&] {
|
||||||
|
move_selected_files(trashPath, savePath, TrashMoveType::MOVE_OUT_OF_TRASH);
|
||||||
|
update_file_list(fileList, trashPath, true);
|
||||||
|
editMode = false;
|
||||||
|
});
|
||||||
|
edit_action_bar_button("delete", "data/icons/trash.svg", "Delete", [&] {
|
||||||
|
delete_selected_files_in_trash();
|
||||||
|
update_file_list(fileList, trashPath, true);
|
||||||
|
editMode = false;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else if(selectedMenu == SelectedMenu::TRASH) {
|
});
|
||||||
edit_action_bar_button("restore", "data/icons/RemixIcon/refresh-line.svg", "Restore", [&] {
|
});
|
||||||
move_selected_files(trashPath, savePath, TrashMoveType::MOVE_OUT_OF_TRASH);
|
}
|
||||||
update_file_list(fileList, trashPath, true);
|
|
||||||
editMode = false;
|
|
||||||
});
|
|
||||||
edit_action_bar_button("delete", "data/icons/trash.svg", "Delete", [&] {
|
|
||||||
delete_selected_files_in_trash();
|
|
||||||
update_file_list(fileList, trashPath, true);
|
|
||||||
editMode = false;
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
@ -382,126 +386,134 @@ void FileSelectScreen::edit_action_bar() {
|
||||||
|
|
||||||
void FileSelectScreen::edit_title_bar() {
|
void FileSelectScreen::edit_title_bar() {
|
||||||
auto& gui = main.g.gui;
|
auto& gui = main.g.gui;
|
||||||
window_fill_side_bar(gui, "edit top toolbar", {
|
gui.element<LayoutElement>("edit top toolbar", [&](LayoutElement*, const Clay_ElementId& lId) {
|
||||||
.dir = WindowFillSideBarConfig::Direction::TOP,
|
CLAY(lId, {}) {
|
||||||
.backgroundColor = gui.io.theme->backColor0
|
window_fill_side_bar(gui, {
|
||||||
}, [&] {
|
.dir = WindowFillSideBarConfig::Direction::TOP,
|
||||||
CLAY_AUTO_ID({
|
.backgroundColor = gui.io.theme->backColor0
|
||||||
.layout = {
|
}, [&] {
|
||||||
.sizing = {.width = CLAY_SIZING_GROW(0), .height = CLAY_SIZING_FIT(0)},
|
CLAY_AUTO_ID({
|
||||||
.padding = CLAY_PADDING_ALL(gui.io.theme->padding1),
|
.layout = {
|
||||||
.childGap = gui.io.theme->childGap1,
|
.sizing = {.width = CLAY_SIZING_GROW(0), .height = CLAY_SIZING_FIT(0)},
|
||||||
.childAlignment = { .x = CLAY_ALIGN_X_LEFT, .y = CLAY_ALIGN_Y_CENTER },
|
.padding = CLAY_PADDING_ALL(gui.io.theme->padding1),
|
||||||
.layoutDirection = CLAY_LEFT_TO_RIGHT,
|
.childGap = gui.io.theme->childGap1,
|
||||||
}
|
.childAlignment = { .x = CLAY_ALIGN_X_LEFT, .y = CLAY_ALIGN_Y_CENTER },
|
||||||
}) {
|
.layoutDirection = CLAY_LEFT_TO_RIGHT,
|
||||||
svg_icon_button(gui, "close edit mode button", "data/icons/close.svg", {
|
}
|
||||||
.drawType = SelectableButton::DrawType::TRANSPARENT_ALL,
|
}) {
|
||||||
.onClick = [&] {
|
svg_icon_button(gui, "close edit mode button", "data/icons/close.svg", {
|
||||||
editMode = false;
|
.drawType = SelectableButton::DrawType::TRANSPARENT_ALL,
|
||||||
|
.onClick = [&] {
|
||||||
|
editMode = false;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
mutable_text_label(gui, "select files label", (numberOfSelectedEntries == 0) ? "Select files" : (std::to_string(numberOfSelectedEntries) + " selected"));
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
mutable_text_label(gui, "select files label", (numberOfSelectedEntries == 0) ? "Select files" : (std::to_string(numberOfSelectedEntries) + " selected"));
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
void FileSelectScreen::title_bar() {
|
void FileSelectScreen::title_bar() {
|
||||||
auto& gui = main.g.gui;
|
auto& gui = main.g.gui;
|
||||||
window_fill_side_bar(gui, "top toolbar", {
|
gui.element<LayoutElement>("top toolbar", [&](LayoutElement*, const Clay_ElementId& lId) {
|
||||||
.dir = WindowFillSideBarConfig::Direction::TOP,
|
CLAY(lId, {}) {
|
||||||
.backgroundColor = gui.io.theme->backColor0
|
window_fill_side_bar(gui, {
|
||||||
}, [&] {
|
.dir = WindowFillSideBarConfig::Direction::TOP,
|
||||||
CLAY_AUTO_ID({
|
.backgroundColor = gui.io.theme->backColor0
|
||||||
.layout = {
|
}, [&] {
|
||||||
.sizing = {.width = CLAY_SIZING_GROW(0), .height = CLAY_SIZING_GROW(0)},
|
CLAY_AUTO_ID({
|
||||||
.padding = CLAY_PADDING_ALL(gui.io.theme->padding1),
|
.layout = {
|
||||||
.childGap = gui.io.theme->childGap1,
|
.sizing = {.width = CLAY_SIZING_GROW(0), .height = CLAY_SIZING_GROW(0)},
|
||||||
.childAlignment = {.x = CLAY_ALIGN_X_LEFT, .y = CLAY_ALIGN_Y_CENTER},
|
.padding = CLAY_PADDING_ALL(gui.io.theme->padding1),
|
||||||
.layoutDirection = CLAY_LEFT_TO_RIGHT
|
.childGap = gui.io.theme->childGap1,
|
||||||
}
|
.childAlignment = {.x = CLAY_ALIGN_X_LEFT, .y = CLAY_ALIGN_Y_CENTER},
|
||||||
}) {
|
.layoutDirection = CLAY_LEFT_TO_RIGHT
|
||||||
svg_icon_button(gui, "main settings button", "data/icons/menu.svg", {
|
|
||||||
.drawType = SelectableButton::DrawType::TRANSPARENT_ALL,
|
|
||||||
.onClick = [&] {
|
|
||||||
mainMenuOpenAnim->animation_trigger();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
switch(selectedMenu) {
|
|
||||||
case SelectedMenu::FILES:
|
|
||||||
mutable_text_label(gui, "main screen header text", "Files");
|
|
||||||
break;
|
|
||||||
case SelectedMenu::TRASH:
|
|
||||||
mutable_text_label(gui, "main screen header text", "Trash");
|
|
||||||
break;
|
|
||||||
case SelectedMenu::SETTINGS:
|
|
||||||
mutable_text_label(gui, "main screen header text", "Settings");
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
CLAY_AUTO_ID({
|
|
||||||
.layout = {
|
|
||||||
.sizing = {.width = CLAY_SIZING_GROW(0), .height = CLAY_SIZING_GROW(0)},
|
|
||||||
}
|
|
||||||
}) {}
|
|
||||||
if(selectedMenu == SelectedMenu::FILES || selectedMenu == SelectedMenu::TRASH) {
|
|
||||||
SelectableButton* moreButton = svg_icon_button(gui, "more settings button", "data/icons/RemixIcon/more-2-fill.svg", {
|
|
||||||
.drawType = SelectableButton::DrawType::TRANSPARENT_ALL,
|
|
||||||
.onClick = [&] {
|
|
||||||
moreOptionsMenu = MoreOptionsMenu::MAIN;
|
|
||||||
}
|
}
|
||||||
});
|
}) {
|
||||||
if(moreButton->get_bb().has_value() && moreOptionsMenu != MoreOptionsMenu::CLOSED) {
|
svg_icon_button(gui, "main settings button", "data/icons/menu.svg", {
|
||||||
gui.set_z_index(gui.get_z_index() + 10, [&] {
|
.drawType = SelectableButton::DrawType::TRANSPARENT_ALL,
|
||||||
gui.element<PositionAdjustingPopupMenu>("more options popup", moreButton->get_bb().value().top_right(), [&] {
|
.onClick = [&] {
|
||||||
CLAY_AUTO_ID({
|
mainMenuOpenAnim->animation_trigger();
|
||||||
.layout = {
|
}
|
||||||
.sizing = {.width = CLAY_SIZING_FIT(200), .height = CLAY_SIZING_FIT(0)},
|
});
|
||||||
.layoutDirection = CLAY_TOP_TO_BOTTOM
|
switch(selectedMenu) {
|
||||||
},
|
case SelectedMenu::FILES:
|
||||||
.backgroundColor = convert_vec4<Clay_Color>(gui.io.theme->backColor1),
|
mutable_text_label(gui, "main screen header text", "Files");
|
||||||
.cornerRadius = CLAY_CORNER_RADIUS(4)
|
break;
|
||||||
}) {
|
case SelectedMenu::TRASH:
|
||||||
if(moreOptionsMenu == MoreOptionsMenu::MAIN) {
|
mutable_text_label(gui, "main screen header text", "Trash");
|
||||||
text_transparent_option_button("Edit", "Edit", [&] {
|
break;
|
||||||
moreOptionsMenu = MoreOptionsMenu::CLOSED;
|
case SelectedMenu::SETTINGS:
|
||||||
start_edit_mode();
|
mutable_text_label(gui, "main screen header text", "Settings");
|
||||||
});
|
break;
|
||||||
text_transparent_option_button("View", "View", [&] {
|
}
|
||||||
moreOptionsMenu = MoreOptionsMenu::VIEW;
|
CLAY_AUTO_ID({
|
||||||
});
|
.layout = {
|
||||||
}
|
.sizing = {.width = CLAY_SIZING_GROW(0), .height = CLAY_SIZING_GROW(0)},
|
||||||
else if(moreOptionsMenu == MoreOptionsMenu::VIEW) {
|
}
|
||||||
text_transparent_option_button("Large Grid", "Large Grid", [&] {
|
}) {}
|
||||||
fileViewType = FileViewType::LARGE_GRID;
|
if(selectedMenu == SelectedMenu::FILES || selectedMenu == SelectedMenu::TRASH) {
|
||||||
moreOptionsMenu = MoreOptionsMenu::CLOSED;
|
SelectableButton* moreButton = svg_icon_button(gui, "more settings button", "data/icons/RemixIcon/more-2-fill.svg", {
|
||||||
});
|
.drawType = SelectableButton::DrawType::TRANSPARENT_ALL,
|
||||||
text_transparent_option_button("Medium Grid", "Medium Grid", [&] {
|
.onClick = [&] {
|
||||||
fileViewType = FileViewType::MEDIUM_GRID;
|
moreOptionsMenu = MoreOptionsMenu::MAIN;
|
||||||
moreOptionsMenu = MoreOptionsMenu::CLOSED;
|
|
||||||
});
|
|
||||||
text_transparent_option_button("Small Grid", "Small Grid", [&] {
|
|
||||||
fileViewType = FileViewType::SMALL_GRID;
|
|
||||||
moreOptionsMenu = MoreOptionsMenu::CLOSED;
|
|
||||||
});
|
|
||||||
text_transparent_option_button("List", "List", [&] {
|
|
||||||
fileViewType = FileViewType::LIST;
|
|
||||||
moreOptionsMenu = MoreOptionsMenu::CLOSED;
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}, LayoutElement::Callbacks{
|
|
||||||
.onClick = [&](LayoutElement* l, const InputManager::MouseButtonCallbackArgs& m) {
|
|
||||||
if(!l->mouseHovering && !m.down) {
|
|
||||||
gui.set_post_callback_func_high_priority([&] { // Cancel actions on other buttons
|
|
||||||
moreOptionsMenu = MoreOptionsMenu::CLOSED;
|
|
||||||
main.g.gui.set_to_layout();
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
});
|
if(moreButton->get_bb().has_value() && moreOptionsMenu != MoreOptionsMenu::CLOSED) {
|
||||||
|
gui.set_z_index(gui.get_z_index() + 10, [&] {
|
||||||
|
gui.element<PositionAdjustingPopupMenu>("more options popup", moreButton->get_bb().value().top_right(), [&] {
|
||||||
|
CLAY_AUTO_ID({
|
||||||
|
.layout = {
|
||||||
|
.sizing = {.width = CLAY_SIZING_FIT(200), .height = CLAY_SIZING_FIT(0)},
|
||||||
|
.layoutDirection = CLAY_TOP_TO_BOTTOM
|
||||||
|
},
|
||||||
|
.backgroundColor = convert_vec4<Clay_Color>(gui.io.theme->backColor1),
|
||||||
|
.cornerRadius = CLAY_CORNER_RADIUS(4)
|
||||||
|
}) {
|
||||||
|
if(moreOptionsMenu == MoreOptionsMenu::MAIN) {
|
||||||
|
text_transparent_option_button("Edit", "Edit", [&] {
|
||||||
|
moreOptionsMenu = MoreOptionsMenu::CLOSED;
|
||||||
|
start_edit_mode();
|
||||||
|
});
|
||||||
|
text_transparent_option_button("View", "View", [&] {
|
||||||
|
moreOptionsMenu = MoreOptionsMenu::VIEW;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
else if(moreOptionsMenu == MoreOptionsMenu::VIEW) {
|
||||||
|
text_transparent_option_button("Large Grid", "Large Grid", [&] {
|
||||||
|
fileViewType = FileViewType::LARGE_GRID;
|
||||||
|
moreOptionsMenu = MoreOptionsMenu::CLOSED;
|
||||||
|
});
|
||||||
|
text_transparent_option_button("Medium Grid", "Medium Grid", [&] {
|
||||||
|
fileViewType = FileViewType::MEDIUM_GRID;
|
||||||
|
moreOptionsMenu = MoreOptionsMenu::CLOSED;
|
||||||
|
});
|
||||||
|
text_transparent_option_button("Small Grid", "Small Grid", [&] {
|
||||||
|
fileViewType = FileViewType::SMALL_GRID;
|
||||||
|
moreOptionsMenu = MoreOptionsMenu::CLOSED;
|
||||||
|
});
|
||||||
|
text_transparent_option_button("List", "List", [&] {
|
||||||
|
fileViewType = FileViewType::LIST;
|
||||||
|
moreOptionsMenu = MoreOptionsMenu::CLOSED;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}, LayoutElement::Callbacks{
|
||||||
|
.onClick = [&](LayoutElement* l, const InputManager::MouseButtonCallbackArgs& m) {
|
||||||
|
if(!l->mouseHovering && !m.down) {
|
||||||
|
gui.set_post_callback_func_high_priority([&] { // Cancel actions on other buttons
|
||||||
|
moreOptionsMenu = MoreOptionsMenu::CLOSED;
|
||||||
|
main.g.gui.set_to_layout();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
});
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
@ -530,39 +542,43 @@ void FileSelectScreen::icon_text_transparent_option_selected_button(const char*
|
||||||
void FileSelectScreen::main_menu() {
|
void FileSelectScreen::main_menu() {
|
||||||
if(!mainMenuOpenAnim->is_at_start()) {
|
if(!mainMenuOpenAnim->is_at_start()) {
|
||||||
auto& gui = main.g.gui;
|
auto& gui = main.g.gui;
|
||||||
window_fill_side_bar(gui, "main menu popup", {
|
gui.element<LayoutElement>("main menu popup layout element", [&](LayoutElement*, const Clay_ElementId& lId) {
|
||||||
.dir = WindowFillSideBarConfig::Direction::LEFT,
|
CLAY(lId, {}) {
|
||||||
.backgroundColor = gui.io.theme->backColor0
|
window_fill_side_bar(gui, {
|
||||||
}, [&] {
|
.dir = WindowFillSideBarConfig::Direction::LEFT,
|
||||||
gui.element<LayoutElement>("inner main menu element", [&] (LayoutElement*, const Clay_ElementId& lId) {
|
.backgroundColor = gui.io.theme->backColor0
|
||||||
CLAY(lId, {
|
}, [&] {
|
||||||
.layout = {
|
gui.element<LayoutElement>("inner main menu element", [&] (LayoutElement*, const Clay_ElementId& lId) {
|
||||||
.sizing = {.width = CLAY_SIZING_FIXED(300.0f * mainMenuOpenAnim->get_val()), .height = CLAY_SIZING_GROW(0)},
|
CLAY(lId, {
|
||||||
.padding = CLAY_PADDING_ALL(gui.io.theme->padding1),
|
.layout = {
|
||||||
.layoutDirection = CLAY_TOP_TO_BOTTOM,
|
.sizing = {.width = CLAY_SIZING_FIXED(300.0f * mainMenuOpenAnim->get_val()), .height = CLAY_SIZING_GROW(0)},
|
||||||
},
|
.padding = CLAY_PADDING_ALL(gui.io.theme->padding1),
|
||||||
}) {
|
.layoutDirection = CLAY_TOP_TO_BOTTOM,
|
||||||
if(mainMenuOpenAnim->is_at_end()) {
|
},
|
||||||
icon_text_transparent_option_selected_button("Files", "data/icons/folder.svg", "Files", selectedMenu == SelectedMenu::FILES, [&] {
|
}) {
|
||||||
selectedMenu = SelectedMenu::FILES;
|
if(mainMenuOpenAnim->is_at_end()) {
|
||||||
update_file_list(fileList, savePath, false);
|
icon_text_transparent_option_selected_button("Files", "data/icons/folder.svg", "Files", selectedMenu == SelectedMenu::FILES, [&] {
|
||||||
mainMenuOpenAnim->animation_trigger_reverse();
|
selectedMenu = SelectedMenu::FILES;
|
||||||
if(fileViewScrollArea) fileViewScrollArea->reset_scroll();
|
update_file_list(fileList, savePath, false);
|
||||||
});
|
mainMenuOpenAnim->animation_trigger_reverse();
|
||||||
icon_text_transparent_option_selected_button("Trash", "data/icons/trash.svg", "Trash", selectedMenu == SelectedMenu::TRASH, [&] {
|
if(fileViewScrollArea) fileViewScrollArea->reset_scroll();
|
||||||
selectedMenu = SelectedMenu::TRASH;
|
});
|
||||||
update_file_list(fileList, trashPath, true);
|
icon_text_transparent_option_selected_button("Trash", "data/icons/trash.svg", "Trash", selectedMenu == SelectedMenu::TRASH, [&] {
|
||||||
mainMenuOpenAnim->animation_trigger_reverse();
|
selectedMenu = SelectedMenu::TRASH;
|
||||||
if(fileViewScrollArea) fileViewScrollArea->reset_scroll();
|
update_file_list(fileList, trashPath, true);
|
||||||
});
|
mainMenuOpenAnim->animation_trigger_reverse();
|
||||||
icon_text_transparent_option_selected_button("Settings", "data/icons/RemixIcon/settings-3-line.svg", "Settings", selectedMenu == SelectedMenu::SETTINGS, [&] {
|
if(fileViewScrollArea) fileViewScrollArea->reset_scroll();
|
||||||
selectedMenu = SelectedMenu::SETTINGS;
|
});
|
||||||
mainMenuOpenAnim->animation_trigger_reverse();
|
icon_text_transparent_option_selected_button("Settings", "data/icons/RemixIcon/settings-3-line.svg", "Settings", selectedMenu == SelectedMenu::SETTINGS, [&] {
|
||||||
if(fileViewScrollArea) fileViewScrollArea->reset_scroll();
|
selectedMenu = SelectedMenu::SETTINGS;
|
||||||
});
|
mainMenuOpenAnim->animation_trigger_reverse();
|
||||||
}
|
if(fileViewScrollArea) fileViewScrollArea->reset_scroll();
|
||||||
}
|
});
|
||||||
});
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -42,30 +42,34 @@ void PhoneDrawingProgramScreen::top_toolbar() {
|
||||||
auto& gui = main.g.gui;
|
auto& gui = main.g.gui;
|
||||||
auto& io = gui.io;
|
auto& io = gui.io;
|
||||||
|
|
||||||
window_fill_side_bar(gui, "top toolbar", {
|
gui.element<LayoutElement>("top toolbar", [&](LayoutElement*, const Clay_ElementId& lId) {
|
||||||
.dir = WindowFillSideBarConfig::Direction::TOP,
|
CLAY(lId, {}) {
|
||||||
.backgroundColor = io.theme->backColor0,
|
window_fill_side_bar(gui, {
|
||||||
.border = {
|
.dir = WindowFillSideBarConfig::Direction::TOP,
|
||||||
.color = convert_vec4<Clay_Color>(io.theme->frontColor1),
|
.backgroundColor = io.theme->backColor0,
|
||||||
.width = {.bottom = 1}
|
.border = {
|
||||||
}
|
.color = convert_vec4<Clay_Color>(io.theme->frontColor1),
|
||||||
}, [&] {
|
.width = {.bottom = 1}
|
||||||
CLAY_AUTO_ID({
|
}
|
||||||
.layout = {
|
}, [&] {
|
||||||
.sizing = {.width = CLAY_SIZING_GROW(0), .height = CLAY_SIZING_FIT(0) },
|
CLAY_AUTO_ID({
|
||||||
.childAlignment = { .x = CLAY_ALIGN_X_LEFT, .y = CLAY_ALIGN_Y_CENTER},
|
.layout = {
|
||||||
.layoutDirection = CLAY_LEFT_TO_RIGHT
|
.sizing = {.width = CLAY_SIZING_GROW(0), .height = CLAY_SIZING_FIT(0) },
|
||||||
}
|
.childAlignment = { .x = CLAY_ALIGN_X_LEFT, .y = CLAY_ALIGN_Y_CENTER},
|
||||||
}) {
|
.layoutDirection = CLAY_LEFT_TO_RIGHT
|
||||||
svg_icon_button(gui, "back exit button", "data/icons/RemixIcon/arrow-left-s-line.svg", {
|
}
|
||||||
.drawType = SelectableButton::DrawType::TRANSPARENT_ALL,
|
}) {
|
||||||
.onClick = [&] {
|
svg_icon_button(gui, "back exit button", "data/icons/RemixIcon/arrow-left-s-line.svg", {
|
||||||
main.world->save_to_file(main.world->filePath);
|
.drawType = SelectableButton::DrawType::TRANSPARENT_ALL,
|
||||||
main.set_tab_to_close(main.world.get());
|
.onClick = [&] {
|
||||||
main.set_screen([&] (std::unique_ptr<Screen>) { return std::make_unique<FileSelectScreen>(main); });
|
main.world->save_to_file(main.world->filePath);
|
||||||
|
main.set_tab_to_close(main.world.get());
|
||||||
|
main.set_screen([&] (std::unique_ptr<Screen>) { return std::make_unique<FileSelectScreen>(main); });
|
||||||
|
}
|
||||||
|
});
|
||||||
|
text_label(gui, main.world->name);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
text_label(gui, main.world->name);
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
@ -74,9 +78,8 @@ void PhoneDrawingProgramScreen::bottom_toolbar() {
|
||||||
auto& gui = main.g.gui;
|
auto& gui = main.g.gui;
|
||||||
auto& io = gui.io;
|
auto& io = gui.io;
|
||||||
auto& drawProg = main.world->drawProg;
|
auto& drawProg = main.world->drawProg;
|
||||||
window_fill_side_bar(gui, "bottom toolbar", {
|
window_fill_side_bar(gui, {
|
||||||
.dir = WindowFillSideBarConfig::Direction::BOTTOM,
|
.dir = WindowFillSideBarConfig::Direction::BOTTOM,
|
||||||
.backgroundColor = io.theme->backColor1
|
|
||||||
}, [&] {
|
}, [&] {
|
||||||
CLAY_AUTO_ID({
|
CLAY_AUTO_ID({
|
||||||
.layout = {
|
.layout = {
|
||||||
|
|
@ -85,23 +88,27 @@ void PhoneDrawingProgramScreen::bottom_toolbar() {
|
||||||
.layoutDirection = CLAY_LEFT_TO_RIGHT
|
.layoutDirection = CLAY_LEFT_TO_RIGHT
|
||||||
}
|
}
|
||||||
}) {
|
}) {
|
||||||
CLAY_AUTO_ID({
|
gui.element<LayoutElement>("bottom toolbar", [&](LayoutElement*, const Clay_ElementId& lId) {
|
||||||
.layout = {
|
CLAY(lId, {
|
||||||
.sizing = {.width = CLAY_SIZING_FIT(0), .height = CLAY_SIZING_FIT(0) }
|
.layout = {
|
||||||
|
.sizing = {.width = CLAY_SIZING_FIT(0), .height = CLAY_SIZING_FIT(0) },
|
||||||
|
},
|
||||||
|
.backgroundColor = convert_vec4<Clay_Color>(io.theme->backColor1),
|
||||||
|
.cornerRadius = CLAY_CORNER_RADIUS(io.theme->windowCorners1)
|
||||||
|
}) {
|
||||||
|
gui.clipping_element<ScrollArea>("tools scroll", ScrollArea::Options{
|
||||||
|
.scrollHorizontal = true,
|
||||||
|
.clipHorizontal = true,
|
||||||
|
.scrollbarX = ScrollArea::ScrollbarType::NONE,
|
||||||
|
.layoutDirection = CLAY_LEFT_TO_RIGHT,
|
||||||
|
.xAlign = CLAY_ALIGN_X_LEFT,
|
||||||
|
.yAlign = CLAY_ALIGN_Y_CENTER,
|
||||||
|
.innerContent = [&](auto&) {
|
||||||
|
drawProg.phone_bottom_toolbar_gui(*this);
|
||||||
|
}
|
||||||
|
});
|
||||||
}
|
}
|
||||||
}) {
|
});
|
||||||
gui.element<ScrollArea>("tools scroll", ScrollArea::Options{
|
|
||||||
.scrollHorizontal = true,
|
|
||||||
.clipHorizontal = true,
|
|
||||||
.scrollbarX = ScrollArea::ScrollbarType::NONE,
|
|
||||||
.layoutDirection = CLAY_LEFT_TO_RIGHT,
|
|
||||||
.xAlign = CLAY_ALIGN_X_LEFT,
|
|
||||||
.yAlign = CLAY_ALIGN_Y_CENTER,
|
|
||||||
.innerContent = [&](auto&) {
|
|
||||||
drawProg.phone_bottom_toolbar_gui(*this);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1233,7 +1233,7 @@ void Toolbar::color_palette(const char* id, Vector4f* color, const std::function
|
||||||
gui.new_id(id, [&] {
|
gui.new_id(id, [&] {
|
||||||
auto& palette = main.conf.palettes[paletteData.selectedPalette].colors;
|
auto& palette = main.conf.palettes[paletteData.selectedPalette].colors;
|
||||||
|
|
||||||
gui.element<ScrollArea>("color palette scroll area", ScrollArea::Options{
|
gui.clipping_element<ScrollArea>("color palette scroll area", ScrollArea::Options{
|
||||||
.scrollVertical = true,
|
.scrollVertical = true,
|
||||||
.clipVertical = true,
|
.clipVertical = true,
|
||||||
.scrollbarY = ScrollArea::ScrollbarType::NORMAL,
|
.scrollbarY = ScrollArea::ScrollbarType::NORMAL,
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue