More scroll area fixes, added image display, and continuing work on file selector
This commit is contained in:
parent
4e1ab6fc50
commit
87f5f74c86
12 changed files with 131 additions and 25 deletions
|
|
@ -110,6 +110,7 @@ set(sources "src/main.cpp"
|
||||||
"src/GUIStuff/ClayImplement.cpp"
|
"src/GUIStuff/ClayImplement.cpp"
|
||||||
"src/GUIStuff/Elements/GUIStuffHelpers.cpp"
|
"src/GUIStuff/Elements/GUIStuffHelpers.cpp"
|
||||||
"src/GUIStuff/Elements/Element.cpp"
|
"src/GUIStuff/Elements/Element.cpp"
|
||||||
|
"src/GUIStuff/Elements/ImageDisplay.cpp"
|
||||||
"src/GUIStuff/Elements/SVGIcon.cpp"
|
"src/GUIStuff/Elements/SVGIcon.cpp"
|
||||||
"src/GUIStuff/Elements/RadioButton.cpp"
|
"src/GUIStuff/Elements/RadioButton.cpp"
|
||||||
"src/GUIStuff/Elements/CheckBox.cpp"
|
"src/GUIStuff/Elements/CheckBox.cpp"
|
||||||
|
|
|
||||||
|
|
@ -19,10 +19,6 @@ GUIHolder::GUIHolder(MainProgram& m):
|
||||||
// So, it's better to load the icons at the beginning of the program so that the icon loading doesn't fail later
|
// So, it's better to load the icons at the beginning of the program so that the icon loading doesn't fail later
|
||||||
load_icons_at("data/icons");
|
load_icons_at("data/icons");
|
||||||
|
|
||||||
#ifdef __ANDROID__
|
|
||||||
load_icons_at("data/icons/RemixIcon"); // SDL_GlobDirectory doesn't work recursively on Android
|
|
||||||
#endif
|
|
||||||
|
|
||||||
load_default_theme();
|
load_default_theme();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,5 @@
|
||||||
#include "ScrollAreaHelpers.hpp"
|
#include "ScrollAreaHelpers.hpp"
|
||||||
#include "../GUIManager.hpp"
|
#include "../GUIManager.hpp"
|
||||||
#include "../Elements/LayoutElement.hpp"
|
|
||||||
|
|
||||||
namespace GUIStuff { namespace ElementHelpers {
|
namespace GUIStuff { namespace ElementHelpers {
|
||||||
|
|
||||||
|
|
@ -13,8 +12,23 @@ ScrollArea* scroll_area_many_entries(GUIManager& gui, const char* id, const Scro
|
||||||
.innerContent = [&](const ScrollArea::InnerContentParameters& params) {
|
.innerContent = [&](const ScrollArea::InnerContentParameters& params) {
|
||||||
if(options.innerContentExtraCallback) options.innerContentExtraCallback(params);
|
if(options.innerContentExtraCallback) options.innerContentExtraCallback(params);
|
||||||
|
|
||||||
if(params.containerDimensions.y() == 0.0f)
|
if(params.containerDimensions.y() == 0.0f) {
|
||||||
|
if(options.growing) {
|
||||||
|
CLAY_AUTO_ID({
|
||||||
|
.layout = {
|
||||||
|
.sizing = {.width = CLAY_SIZING_GROW(0), .height = CLAY_SIZING_FIXED(1)},
|
||||||
|
}
|
||||||
|
}) { }
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
CLAY_AUTO_ID({
|
||||||
|
.layout = {
|
||||||
|
.sizing = {.width = CLAY_SIZING_GROW(0), .height = CLAY_SIZING_GROW(0)},
|
||||||
|
}
|
||||||
|
}) { }
|
||||||
|
}
|
||||||
return;
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
float absScrollAmount = std::fabs(params.scrollOffset->y());
|
float absScrollAmount = std::fabs(params.scrollOffset->y());
|
||||||
size_t startPoint = absScrollAmount / options.entryHeight;
|
size_t startPoint = absScrollAmount / options.entryHeight;
|
||||||
|
|
@ -32,13 +46,11 @@ ScrollArea* scroll_area_many_entries(GUIManager& gui, const char* id, const Scro
|
||||||
gui.new_id("many element list", [&] {
|
gui.new_id("many element list", [&] {
|
||||||
for(size_t i = startPoint; i < endPoint; i++) {
|
for(size_t i = startPoint; i < endPoint; i++) {
|
||||||
gui.new_id(i - startPoint, [&] {
|
gui.new_id(i - startPoint, [&] {
|
||||||
gui.element<LayoutElement>("elem", [&] (LayoutElement*, const Clay_ElementId& lId) {
|
CLAY_AUTO_ID({
|
||||||
CLAY(lId, {
|
.layout = { .sizing = {.width = CLAY_SIZING_GROW(0), .height = CLAY_SIZING_FIXED(options.entryHeight)}}
|
||||||
.layout = { .sizing = {.width = CLAY_SIZING_GROW(0), .height = CLAY_SIZING_FIXED(options.entryHeight)}}
|
}) {
|
||||||
}) {
|
options.elementContent(i);
|
||||||
options.elementContent(i);
|
}
|
||||||
}
|
|
||||||
});
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -7,6 +7,7 @@ struct ScrollBarManyEntriesOptions {
|
||||||
float entryHeight;
|
float entryHeight;
|
||||||
size_t entryCount;
|
size_t entryCount;
|
||||||
bool clipHorizontal = false;
|
bool clipHorizontal = false;
|
||||||
|
bool growing = false; // If set to false, this element has a fixed size. Otherwise, is a growing element.
|
||||||
std::function<void(size_t elementIndex)> elementContent;
|
std::function<void(size_t elementIndex)> elementContent;
|
||||||
std::function<void(const ScrollArea::InnerContentParameters&)> innerContentExtraCallback;
|
std::function<void(const ScrollArea::InnerContentParameters&)> innerContentExtraCallback;
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -85,6 +85,7 @@ template <typename T> class DropDown : public Element {
|
||||||
.entryHeight = 18.0f,
|
.entryHeight = 18.0f,
|
||||||
.entryCount = selections.size(),
|
.entryCount = selections.size(),
|
||||||
.clipHorizontal = true,
|
.clipHorizontal = true,
|
||||||
|
.growing = true,
|
||||||
.elementContent = [&](size_t i) {
|
.elementContent = [&](size_t i) {
|
||||||
bool selectedEntry = static_cast<size_t>(*data) == i;
|
bool selectedEntry = static_cast<size_t>(*data) == i;
|
||||||
gui.element<LayoutElement>("elem", [&] (LayoutElement*, const Clay_ElementId& lId) {
|
gui.element<LayoutElement>("elem", [&] (LayoutElement*, const Clay_ElementId& lId) {
|
||||||
|
|
|
||||||
42
src/GUIStuff/Elements/ImageDisplay.cpp
Normal file
42
src/GUIStuff/Elements/ImageDisplay.cpp
Normal file
|
|
@ -0,0 +1,42 @@
|
||||||
|
#include "ImageDisplay.hpp"
|
||||||
|
#include "../GUIManager.hpp"
|
||||||
|
#include <include/codec/SkJpegDecoder.h>
|
||||||
|
|
||||||
|
namespace GUIStuff {
|
||||||
|
|
||||||
|
ImageDisplay::ImageDisplay(GUIManager& gui): Element(gui) {}
|
||||||
|
|
||||||
|
void ImageDisplay::layout(const Clay_ElementId& id, const std::filesystem::path& imgPath) {
|
||||||
|
if(imgPath != oldImgPath) {
|
||||||
|
std::string imgData;
|
||||||
|
try {
|
||||||
|
imgData = read_file_to_string(imgPath);
|
||||||
|
auto codec = SkCodec::MakeFromData(SkData::MakeWithoutCopy(imgData.c_str(), imgData.size()), {
|
||||||
|
SkJpegDecoder::Decoder()
|
||||||
|
});
|
||||||
|
img = std::get<0>(codec->getImage());
|
||||||
|
} catch(...) {
|
||||||
|
img = nullptr;
|
||||||
|
}
|
||||||
|
gui.invalidate_draw_element(this);
|
||||||
|
}
|
||||||
|
|
||||||
|
CLAY(id, {
|
||||||
|
.layout = {.sizing = {.width = CLAY_SIZING_GROW(0), .height = CLAY_SIZING_GROW(0)}},
|
||||||
|
.custom = {.customData = this}
|
||||||
|
}) {
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void ImageDisplay::clay_draw(SkCanvas* canvas, UpdateInputData& io, Clay_RenderCommand* command, bool skiaAA) {
|
||||||
|
if(img) {
|
||||||
|
canvas->drawImageRect(img, boundingBox.value().get_sk_rect(), {SkFilterMode::kLinear, SkMipmapMode::kNone});
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
SkPaint p{io.theme->frontColor1};
|
||||||
|
p.setAntiAlias(skiaAA);
|
||||||
|
canvas->drawRect(boundingBox.value().get_sk_rect(), p);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
18
src/GUIStuff/Elements/ImageDisplay.hpp
Normal file
18
src/GUIStuff/Elements/ImageDisplay.hpp
Normal file
|
|
@ -0,0 +1,18 @@
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include "Element.hpp"
|
||||||
|
|
||||||
|
namespace GUIStuff {
|
||||||
|
|
||||||
|
class ImageDisplay : public Element {
|
||||||
|
public:
|
||||||
|
ImageDisplay(GUIManager& gui);
|
||||||
|
void layout(const Clay_ElementId& id, const std::filesystem::path& imgPath);
|
||||||
|
virtual void clay_draw(SkCanvas* canvas, UpdateInputData& io, Clay_RenderCommand* command, bool skiaAA) override;
|
||||||
|
|
||||||
|
private:
|
||||||
|
std::filesystem::path oldImgPath;
|
||||||
|
sk_sp<SkImage> img;
|
||||||
|
};
|
||||||
|
|
||||||
|
}
|
||||||
|
|
@ -57,6 +57,7 @@ void TreeListing::layout(const Clay_ElementId& id, const Data& newDisplayData) {
|
||||||
scroll_area_many_entries(gui, "scroll", {
|
scroll_area_many_entries(gui, "scroll", {
|
||||||
.entryHeight = ENTRY_HEIGHT,
|
.entryHeight = ENTRY_HEIGHT,
|
||||||
.entryCount = flattenedIndexList.size(),
|
.entryCount = flattenedIndexList.size(),
|
||||||
|
.growing = d.scrollAreaGrowing,
|
||||||
.elementContent = [&](size_t i) {
|
.elementContent = [&](size_t i) {
|
||||||
const ObjInfo& objInfo = flattenedIndexList[i];
|
const ObjInfo& objInfo = flattenedIndexList[i];
|
||||||
gui.element<LayoutElement>("elem", [&](LayoutElement*, const Clay_ElementId& lId) {
|
gui.element<LayoutElement>("elem", [&](LayoutElement*, const Clay_ElementId& lId) {
|
||||||
|
|
|
||||||
|
|
@ -31,6 +31,7 @@ class TreeListing : public Element {
|
||||||
};
|
};
|
||||||
|
|
||||||
struct Data {
|
struct Data {
|
||||||
|
bool scrollAreaGrowing = true;
|
||||||
std::set<TreeListingObjIndexList>* selectedIndices = nullptr;
|
std::set<TreeListingObjIndexList>* selectedIndices = nullptr;
|
||||||
std::function<std::optional<DirectoryInfo>(const TreeListingObjIndexList& objIndex)> dirInfo;
|
std::function<std::optional<DirectoryInfo>(const TreeListingObjIndexList& objIndex)> dirInfo;
|
||||||
std::function<void(const TreeListingObjIndexList& objIndex, bool isOpen)> setDirectoryOpen;
|
std::function<void(const TreeListingObjIndexList& objIndex, bool isOpen)> setDirectoryOpen;
|
||||||
|
|
|
||||||
|
|
@ -4,8 +4,8 @@
|
||||||
#include "../GUIStuff/ElementHelpers/TextLabelHelpers.hpp"
|
#include "../GUIStuff/ElementHelpers/TextLabelHelpers.hpp"
|
||||||
#include "Helpers/ConvertVec.hpp"
|
#include "Helpers/ConvertVec.hpp"
|
||||||
#include "../GUIStuff/Elements/GridScrollArea.hpp"
|
#include "../GUIStuff/Elements/GridScrollArea.hpp"
|
||||||
#include "../GUIStuff/ElementHelpers/ButtonHelpers.hpp"
|
#include "../GUIStuff/Elements/ImageDisplay.hpp"
|
||||||
#include "../GUIStuff/ElementHelpers/ScrollAreaHelpers.hpp"
|
#include "../World.hpp"
|
||||||
|
|
||||||
FileSelectScreen::FileSelectScreen(MainProgram& m): Screen(m) {}
|
FileSelectScreen::FileSelectScreen(MainProgram& m): Screen(m) {}
|
||||||
|
|
||||||
|
|
@ -17,32 +17,61 @@ void FileSelectScreen::gui_layout_run() {
|
||||||
CLAY_AUTO_ID({
|
CLAY_AUTO_ID({
|
||||||
.layout = {
|
.layout = {
|
||||||
.sizing = {.width = CLAY_SIZING_FIXED(gui.io.windowSize.x()), .height = CLAY_SIZING_FIXED(gui.io.windowSize.y())},
|
.sizing = {.width = CLAY_SIZING_FIXED(gui.io.windowSize.x()), .height = CLAY_SIZING_FIXED(gui.io.windowSize.y())},
|
||||||
|
.padding = CLAY_PADDING_ALL(15),
|
||||||
.childGap = 15,
|
.childGap = 15,
|
||||||
.childAlignment = { .x = CLAY_ALIGN_X_CENTER, .y = CLAY_ALIGN_Y_TOP },
|
.childAlignment = { .x = CLAY_ALIGN_X_CENTER, .y = CLAY_ALIGN_Y_TOP },
|
||||||
.layoutDirection = CLAY_TOP_TO_BOTTOM,
|
.layoutDirection = CLAY_TOP_TO_BOTTOM,
|
||||||
},
|
},
|
||||||
}) {
|
}) {
|
||||||
text_label(gui, "Test grid");
|
text_label(gui, "File selector");
|
||||||
gui.element<GridScrollArea>("Test grid", GridScrollArea::Options{
|
auto& fileList = get_file_list();
|
||||||
.entryMaximumWidth = 100.0f,
|
gui.element<GridScrollArea>("File selector grid", GridScrollArea::Options{
|
||||||
|
.entryMaximumWidth = 200.0f,
|
||||||
.childAlignmentX = CLAY_ALIGN_X_LEFT,
|
.childAlignmentX = CLAY_ALIGN_X_LEFT,
|
||||||
.entryHeight = 100.0f,
|
.entryHeight = 250.0f,
|
||||||
.entryCount = 20000,
|
.entryCount = fileList.size(),
|
||||||
.elementContent = [&](size_t i) {
|
.elementContent = [&](size_t i) {
|
||||||
CLAY_AUTO_ID({
|
CLAY_AUTO_ID({
|
||||||
.layout = {
|
.layout = {
|
||||||
.sizing = { .width = CLAY_SIZING_GROW(0), .height = CLAY_SIZING_GROW(0)},
|
.sizing = { .width = CLAY_SIZING_FIXED(150), .height = CLAY_SIZING_GROW(0)},
|
||||||
.padding = CLAY_PADDING_ALL(2),
|
.padding = CLAY_PADDING_ALL(gui.io.theme->padding1),
|
||||||
|
.childGap = 2,
|
||||||
.childAlignment = { .x = CLAY_ALIGN_X_CENTER, .y = CLAY_ALIGN_Y_CENTER },
|
.childAlignment = { .x = CLAY_ALIGN_X_CENTER, .y = CLAY_ALIGN_Y_CENTER },
|
||||||
|
.layoutDirection = CLAY_TOP_TO_BOTTOM
|
||||||
}
|
}
|
||||||
}) {
|
}) {
|
||||||
text_button_sized(gui, "button", "Square " + std::to_string(i), CLAY_SIZING_GROW(0), CLAY_SIZING_GROW(0));
|
CLAY_AUTO_ID({
|
||||||
|
.layout = { .sizing = {.width = CLAY_SIZING_GROW(0), .height = CLAY_SIZING_GROW(0) }},
|
||||||
|
.aspectRatio = { .aspectRatio = 1.0f }
|
||||||
|
}) {
|
||||||
|
gui.element<ImageDisplay>("ico", main.conf.configPath / "saveThumbnails" / (fileList[i] + ".jpg"));
|
||||||
|
}
|
||||||
|
text_label(gui, fileList[i]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void FileSelectScreen::draw(SkCanvas* canvas) {
|
const std::vector<std::string>& FileSelectScreen::get_file_list() {
|
||||||
canvas->clear(SkColor4f{0.0f, 0.0f, 0.0f, 0.0f});
|
if(!fileListOptional.has_value()) {
|
||||||
|
std::filesystem::path savePath = main.conf.configPath / "saves";
|
||||||
|
fileListOptional = std::vector<std::string>();
|
||||||
|
auto& fL = fileListOptional.value();
|
||||||
|
int globCount;
|
||||||
|
char** filesInPath = SDL_GlobDirectory(savePath.string().c_str(), "*", 0, &globCount);
|
||||||
|
if(filesInPath) {
|
||||||
|
for(int i = 0; i < globCount; i++) {
|
||||||
|
std::filesystem::path p = filesInPath[i];
|
||||||
|
std::string fExt = p.extension().string();
|
||||||
|
if(fExt == "." + World::FILE_EXTENSION)
|
||||||
|
fL.emplace_back(p.stem().string());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return fileListOptional.value();
|
||||||
|
}
|
||||||
|
|
||||||
|
void FileSelectScreen::draw(SkCanvas* canvas) {
|
||||||
|
canvas->clear(main.g.gui.io.theme->backColor1);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -6,4 +6,7 @@ class FileSelectScreen : public Screen {
|
||||||
FileSelectScreen(MainProgram& m);
|
FileSelectScreen(MainProgram& m);
|
||||||
virtual void gui_layout_run() override;
|
virtual void gui_layout_run() override;
|
||||||
virtual void draw(SkCanvas* canvas) override;
|
virtual void draw(SkCanvas* canvas) override;
|
||||||
|
private:
|
||||||
|
const std::vector<std::string>& get_file_list();
|
||||||
|
std::optional<std::vector<std::string>> fileListOptional;
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -800,6 +800,7 @@ void Toolbar::grid_menu(Element* gridMenuButton) {
|
||||||
.entryHeight = ENTRY_HEIGHT,
|
.entryHeight = ENTRY_HEIGHT,
|
||||||
.entryCount = main.world->gridMan.grids->size(),
|
.entryCount = main.world->gridMan.grids->size(),
|
||||||
.clipHorizontal = true,
|
.clipHorizontal = true,
|
||||||
|
.growing = true,
|
||||||
.elementContent = [&](size_t i) {
|
.elementContent = [&](size_t i) {
|
||||||
auto& grid = main.world->gridMan.grids->at(i)->obj;
|
auto& grid = main.world->gridMan.grids->at(i)->obj;
|
||||||
bool selectedEntry = gridMenu.selectedGrid == i;
|
bool selectedEntry = gridMenu.selectedGrid == i;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue