Added phone tool settings
This commit is contained in:
parent
f1d7cbf896
commit
c90c09b169
42 changed files with 479 additions and 57 deletions
|
|
@ -398,36 +398,6 @@ void DrawingProgram::toolbar_gui(Toolbar& t) {
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
void DrawingProgram::phone_bottom_toolbar_gui(PhoneDrawingProgramScreen& t) {
|
|
||||||
using namespace GUIStuff;
|
|
||||||
using namespace ElementHelpers;
|
|
||||||
|
|
||||||
GUIManager& gui = world.main.g.gui;
|
|
||||||
|
|
||||||
auto tool_button = [&](const char* id, const std::string& svgPath, DrawingProgramToolType toolType) {
|
|
||||||
svg_icon_button(gui, id, svgPath, {
|
|
||||||
.drawType = SelectableButton::DrawType::TRANSPARENT_ALL,
|
|
||||||
.isSelected = drawTool->get_type() == toolType,
|
|
||||||
.onClick = [&, toolType] {
|
|
||||||
switch_to_tool(toolType);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
tool_button("Brush Toolbar Button", "data/icons/brush.svg", DrawingProgramToolType::BRUSH);
|
|
||||||
tool_button("Eraser Toolbar Button", "data/icons/eraser.svg", DrawingProgramToolType::ERASER);
|
|
||||||
tool_button("Line Toolbar Button", "data/icons/line.svg", DrawingProgramToolType::LINE);
|
|
||||||
tool_button("Text Toolbar Button", "data/icons/text.svg", DrawingProgramToolType::TEXTBOX);
|
|
||||||
tool_button("Ellipse Toolbar Button", "data/icons/circle.svg", DrawingProgramToolType::ELLIPSE);
|
|
||||||
tool_button("Rect Toolbar Button", "data/icons/rectangle.svg", DrawingProgramToolType::RECTANGLE);
|
|
||||||
tool_button("RectSelect Toolbar Button", "data/icons/rectselect.svg", DrawingProgramToolType::RECTSELECT);
|
|
||||||
tool_button("LassoSelect Toolbar Button", "data/icons/lassoselect.svg", DrawingProgramToolType::LASSOSELECT);
|
|
||||||
tool_button("Edit Toolbar Button", "data/icons/cursor.svg", DrawingProgramToolType::EDIT);
|
|
||||||
tool_button("Eyedropper Toolbar Button", "data/icons/eyedropper.svg", DrawingProgramToolType::EYEDROPPER);
|
|
||||||
tool_button("Zoom Canvas Toolbar Button", "data/icons/zoom.svg", DrawingProgramToolType::ZOOM);
|
|
||||||
tool_button("Pan Canvas Toolbar Button", "data/icons/hand.svg", DrawingProgramToolType::PAN);
|
|
||||||
}
|
|
||||||
|
|
||||||
void DrawingProgram::right_click_popup_gui(Toolbar& t) {
|
void DrawingProgram::right_click_popup_gui(Toolbar& t) {
|
||||||
if(rightClickPopupLocation.has_value())
|
if(rightClickPopupLocation.has_value())
|
||||||
drawTool->right_click_popup_gui(t, rightClickPopupLocation.value());
|
drawTool->right_click_popup_gui(t, rightClickPopupLocation.value());
|
||||||
|
|
|
||||||
|
|
@ -29,7 +29,6 @@ class DrawingProgram {
|
||||||
void toolbar_gui(Toolbar& t);
|
void toolbar_gui(Toolbar& t);
|
||||||
void tool_options_gui(Toolbar& t);
|
void tool_options_gui(Toolbar& t);
|
||||||
void right_click_popup_gui(Toolbar& t);
|
void right_click_popup_gui(Toolbar& t);
|
||||||
void phone_bottom_toolbar_gui(PhoneDrawingProgramScreen& t);
|
|
||||||
void update();
|
void update();
|
||||||
void scale_up(const WorldScalar& scaleUpAmount);
|
void scale_up(const WorldScalar& scaleUpAmount);
|
||||||
void draw(SkCanvas* canvas, const DrawData& drawData);
|
void draw(SkCanvas* canvas, const DrawData& drawData);
|
||||||
|
|
@ -78,6 +77,8 @@ class DrawingProgram {
|
||||||
|
|
||||||
void set_right_click_popup_location(const Vector2f& newLoc);
|
void set_right_click_popup_location(const Vector2f& newLoc);
|
||||||
void clear_right_click_popup();
|
void clear_right_click_popup();
|
||||||
|
|
||||||
|
std::unique_ptr<DrawingProgramToolBase> drawTool;
|
||||||
private:
|
private:
|
||||||
void process_transform_message(const std::vector<std::pair<NetworkingObjects::NetObjID, CoordSpaceHelper>>& transforms);
|
void process_transform_message(const std::vector<std::pair<NetworkingObjects::NetObjID, CoordSpaceHelper>>& transforms);
|
||||||
|
|
||||||
|
|
@ -129,7 +130,6 @@ class DrawingProgram {
|
||||||
};
|
};
|
||||||
std::vector<DroppedDownloadingFile> droppedDownloadingFiles;
|
std::vector<DroppedDownloadingFile> droppedDownloadingFiles;
|
||||||
|
|
||||||
std::unique_ptr<DrawingProgramToolBase> drawTool;
|
|
||||||
|
|
||||||
std::optional<Vector2f> rightClickPopupLocation;
|
std::optional<Vector2f> rightClickPopupLocation;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -60,6 +60,21 @@ void DrawingProgramSelection::selection_gui(Toolbar& t) {
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void DrawingProgramSelection::phone_selection_gui(PhoneDrawingProgramScreen& t) {
|
||||||
|
using namespace GUIStuff;
|
||||||
|
using namespace ElementHelpers;
|
||||||
|
|
||||||
|
auto& gui = drawP.world.main.g.gui;
|
||||||
|
|
||||||
|
gui.new_id("general selection gui", [&] {
|
||||||
|
text_label(gui, "Select from:");
|
||||||
|
radio_button_selector(gui, "layer selector", &drawP.controls.layerSelector, {
|
||||||
|
{"Layer being edited", DrawingProgramLayerManager::LayerSelector::LAYER_BEING_EDITED},
|
||||||
|
{"All visible layers", DrawingProgramLayerManager::LayerSelector::ALL_VISIBLE_LAYERS}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
void DrawingProgramSelection::update_selection_stroke_color() {
|
void DrawingProgramSelection::update_selection_stroke_color() {
|
||||||
if(strokeColorChangeData.oldColor != strokeColorChangeData.newColor) {
|
if(strokeColorChangeData.oldColor != strokeColorChangeData.newColor) {
|
||||||
for(auto& c : selectedSet) {
|
for(auto& c : selectedSet) {
|
||||||
|
|
|
||||||
|
|
@ -5,11 +5,13 @@
|
||||||
#include "../InputManager.hpp"
|
#include "../InputManager.hpp"
|
||||||
|
|
||||||
class DrawingProgram;
|
class DrawingProgram;
|
||||||
|
class PhoneDrawingProgramScreen;
|
||||||
|
|
||||||
class DrawingProgramSelection {
|
class DrawingProgramSelection {
|
||||||
public:
|
public:
|
||||||
DrawingProgramSelection(DrawingProgram& initDrawP);
|
DrawingProgramSelection(DrawingProgram& initDrawP);
|
||||||
void selection_gui(Toolbar& t);
|
void selection_gui(Toolbar& t);
|
||||||
|
void phone_selection_gui(PhoneDrawingProgramScreen& t);
|
||||||
void add_from_cam_coord_collider_to_selection(const SCollision::ColliderCollection<float>& cC, DrawingProgramLayerManager::LayerSelector layerSelector, bool frontObjectOnly);
|
void add_from_cam_coord_collider_to_selection(const SCollision::ColliderCollection<float>& cC, DrawingProgramLayerManager::LayerSelector layerSelector, bool frontObjectOnly);
|
||||||
void remove_from_cam_coord_collider_to_selection(const SCollision::ColliderCollection<float>& cC, DrawingProgramLayerManager::LayerSelector layerSelector, bool frontObjectOnly);
|
void remove_from_cam_coord_collider_to_selection(const SCollision::ColliderCollection<float>& cC, DrawingProgramLayerManager::LayerSelector layerSelector, bool frontObjectOnly);
|
||||||
void erase_component(CanvasComponentContainer::ObjInfo* objToCheck);
|
void erase_component(CanvasComponentContainer::ObjInfo* objToCheck);
|
||||||
|
|
|
||||||
|
|
@ -183,6 +183,18 @@ void BrushTool::gui_toolbox(Toolbar& t) {
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void BrushTool::gui_phone_toolbox(PhoneDrawingProgramScreen& t) {
|
||||||
|
using namespace GUIStuff;
|
||||||
|
using namespace ElementHelpers;
|
||||||
|
|
||||||
|
auto& gui = drawP.world.main.g.gui;
|
||||||
|
|
||||||
|
gui.new_id("brush tool", [&] {
|
||||||
|
checkbox_boolean_field(gui, "hasroundcaps", "Round Caps", &drawP.world.main.toolConfig.brush.hasRoundCaps);
|
||||||
|
drawP.world.main.toolConfig.relative_width_gui(drawP, "Size");
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
void BrushTool::right_click_popup_gui(Toolbar& t, Vector2f popupPos) {
|
void BrushTool::right_click_popup_gui(Toolbar& t, Vector2f popupPos) {
|
||||||
t.paint_popup(popupPos);
|
t.paint_popup(popupPos);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -17,6 +17,7 @@ class BrushTool : public DrawingProgramToolBase {
|
||||||
BrushTool(DrawingProgram& initDrawP);
|
BrushTool(DrawingProgram& initDrawP);
|
||||||
virtual DrawingProgramToolType get_type() override;
|
virtual DrawingProgramToolType get_type() override;
|
||||||
virtual void gui_toolbox(Toolbar& t) override;
|
virtual void gui_toolbox(Toolbar& t) override;
|
||||||
|
virtual void gui_phone_toolbox(PhoneDrawingProgramScreen& t) override;
|
||||||
virtual void tool_update() override;
|
virtual void tool_update() override;
|
||||||
virtual void right_click_popup_gui(Toolbar& t, Vector2f popupPos) override;
|
virtual void right_click_popup_gui(Toolbar& t, Vector2f popupPos) override;
|
||||||
virtual void erase_component(CanvasComponentContainer::ObjInfo* erasedComp) override;
|
virtual void erase_component(CanvasComponentContainer::ObjInfo* erasedComp) override;
|
||||||
|
|
|
||||||
|
|
@ -5,6 +5,7 @@
|
||||||
#include "../../InputManager.hpp"
|
#include "../../InputManager.hpp"
|
||||||
|
|
||||||
class DrawingProgram;
|
class DrawingProgram;
|
||||||
|
class PhoneDrawingProgramScreen;
|
||||||
|
|
||||||
#define MINIMUM_DISTANCE_BETWEEN_BOUNDS 10.0f
|
#define MINIMUM_DISTANCE_BETWEEN_BOUNDS 10.0f
|
||||||
|
|
||||||
|
|
@ -30,6 +31,7 @@ class DrawingProgramToolBase {
|
||||||
DrawingProgramToolBase(DrawingProgram& initDrawP);
|
DrawingProgramToolBase(DrawingProgram& initDrawP);
|
||||||
virtual DrawingProgramToolType get_type() = 0;
|
virtual DrawingProgramToolType get_type() = 0;
|
||||||
virtual void gui_toolbox(Toolbar& t) = 0;
|
virtual void gui_toolbox(Toolbar& t) = 0;
|
||||||
|
virtual void gui_phone_toolbox(PhoneDrawingProgramScreen& t) = 0;
|
||||||
virtual void erase_component(CanvasComponentContainer::ObjInfo* erasedComp) = 0;
|
virtual void erase_component(CanvasComponentContainer::ObjInfo* erasedComp) = 0;
|
||||||
virtual void right_click_popup_gui(Toolbar& t, Vector2f popupPos) = 0;
|
virtual void right_click_popup_gui(Toolbar& t, Vector2f popupPos) = 0;
|
||||||
virtual void tool_update() = 0;
|
virtual void tool_update() = 0;
|
||||||
|
|
|
||||||
|
|
@ -39,6 +39,17 @@ void EditTool::gui_toolbox(Toolbar& t) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void EditTool::gui_phone_toolbox(PhoneDrawingProgramScreen& t) {
|
||||||
|
using namespace GUIStuff;
|
||||||
|
using namespace ElementHelpers;
|
||||||
|
|
||||||
|
auto& gui = drawP.world.main.g.gui;
|
||||||
|
|
||||||
|
gui.new_id("edit tool", [&] {
|
||||||
|
text_label_centered(gui, "Edit");
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
void EditTool::erase_component(CanvasComponentContainer::ObjInfo* erasedComp) {
|
void EditTool::erase_component(CanvasComponentContainer::ObjInfo* erasedComp) {
|
||||||
if(erasedComp == objInfoBeingEdited)
|
if(erasedComp == objInfoBeingEdited)
|
||||||
switch_tool(get_type());
|
switch_tool(get_type());
|
||||||
|
|
|
||||||
|
|
@ -20,6 +20,7 @@ class EditTool : public DrawingProgramToolBase {
|
||||||
EditTool(DrawingProgram& initDrawP);
|
EditTool(DrawingProgram& initDrawP);
|
||||||
virtual DrawingProgramToolType get_type() override;
|
virtual DrawingProgramToolType get_type() override;
|
||||||
virtual void gui_toolbox(Toolbar& t) override;
|
virtual void gui_toolbox(Toolbar& t) override;
|
||||||
|
virtual void gui_phone_toolbox(PhoneDrawingProgramScreen& t) override;
|
||||||
virtual void right_click_popup_gui(Toolbar& t, Vector2f popupPos) override;
|
virtual void right_click_popup_gui(Toolbar& t, Vector2f popupPos) override;
|
||||||
virtual void tool_update() override;
|
virtual void tool_update() override;
|
||||||
virtual void erase_component(CanvasComponentContainer::ObjInfo* erasedComp) override;
|
virtual void erase_component(CanvasComponentContainer::ObjInfo* erasedComp) override;
|
||||||
|
|
|
||||||
|
|
@ -39,6 +39,24 @@ void EllipseDrawTool::gui_toolbox(Toolbar& t) {
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void EllipseDrawTool::gui_phone_toolbox(PhoneDrawingProgramScreen& t) {
|
||||||
|
using namespace GUIStuff;
|
||||||
|
using namespace ElementHelpers;
|
||||||
|
|
||||||
|
auto& gui = drawP.world.main.g.gui;
|
||||||
|
auto& toolConfig = drawP.world.main.toolConfig;
|
||||||
|
auto& fillStrokeMode = toolConfig.ellipseDraw.fillStrokeMode;
|
||||||
|
gui.new_id("ellipse draw tool", [&] {
|
||||||
|
radio_button_selector(gui, "fill type", &fillStrokeMode, {
|
||||||
|
{"Fill only", 0},
|
||||||
|
{"Outline only", 1},
|
||||||
|
{"Fill and Outline", 2}
|
||||||
|
});
|
||||||
|
if(fillStrokeMode == 1 || fillStrokeMode == 2)
|
||||||
|
toolConfig.relative_width_gui(drawP, "Outline Size");
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
void EllipseDrawTool::input_mouse_button_on_canvas_callback(const InputManager::MouseButtonCallbackArgs& button) {
|
void EllipseDrawTool::input_mouse_button_on_canvas_callback(const InputManager::MouseButtonCallbackArgs& button) {
|
||||||
if(button.button == InputManager::MouseButton::LEFT) {
|
if(button.button == InputManager::MouseButton::LEFT) {
|
||||||
if(button.down && drawP.layerMan.is_a_layer_being_edited() && !objInfoBeingEdited && !drawP.world.main.g.gui.cursor_obstructed()) {
|
if(button.down && drawP.layerMan.is_a_layer_being_edited() && !objInfoBeingEdited && !drawP.world.main.g.gui.cursor_obstructed()) {
|
||||||
|
|
|
||||||
|
|
@ -11,6 +11,7 @@ class EllipseDrawTool : public DrawingProgramToolBase {
|
||||||
EllipseDrawTool(DrawingProgram& initDrawP);
|
EllipseDrawTool(DrawingProgram& initDrawP);
|
||||||
virtual DrawingProgramToolType get_type() override;
|
virtual DrawingProgramToolType get_type() override;
|
||||||
virtual void gui_toolbox(Toolbar& t) override;
|
virtual void gui_toolbox(Toolbar& t) override;
|
||||||
|
virtual void gui_phone_toolbox(PhoneDrawingProgramScreen& t) override;
|
||||||
virtual void right_click_popup_gui(Toolbar& t, Vector2f popupPos) override;
|
virtual void right_click_popup_gui(Toolbar& t, Vector2f popupPos) override;
|
||||||
virtual void erase_component(CanvasComponentContainer::ObjInfo* erasedComp) override;
|
virtual void erase_component(CanvasComponentContainer::ObjInfo* erasedComp) override;
|
||||||
virtual void tool_update() override;
|
virtual void tool_update() override;
|
||||||
|
|
|
||||||
|
|
@ -32,6 +32,22 @@ void EraserTool::gui_toolbox(Toolbar& t) {
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void EraserTool::gui_phone_toolbox(PhoneDrawingProgramScreen& t) {
|
||||||
|
using namespace GUIStuff;
|
||||||
|
using namespace ElementHelpers;
|
||||||
|
|
||||||
|
auto& gui = drawP.world.main.g.gui;
|
||||||
|
|
||||||
|
gui.new_id("eraser tool", [&] {
|
||||||
|
drawP.world.main.toolConfig.relative_width_gui(drawP, "Size");
|
||||||
|
text_label(gui, "Erase from:");
|
||||||
|
radio_button_selector(gui, "layer selector", &drawP.controls.layerSelector, {
|
||||||
|
{"Layer being edited", DrawingProgramLayerManager::LayerSelector::LAYER_BEING_EDITED},
|
||||||
|
{"All visible layers", DrawingProgramLayerManager::LayerSelector::ALL_VISIBLE_LAYERS}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
void EraserTool::right_click_popup_gui(Toolbar& t, Vector2f popupPos) {
|
void EraserTool::right_click_popup_gui(Toolbar& t, Vector2f popupPos) {
|
||||||
t.paint_popup(popupPos);
|
t.paint_popup(popupPos);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -10,6 +10,7 @@ class EraserTool : public DrawingProgramToolBase {
|
||||||
EraserTool(DrawingProgram& initDrawP);
|
EraserTool(DrawingProgram& initDrawP);
|
||||||
virtual DrawingProgramToolType get_type() override;
|
virtual DrawingProgramToolType get_type() override;
|
||||||
virtual void gui_toolbox(Toolbar& t) override;
|
virtual void gui_toolbox(Toolbar& t) override;
|
||||||
|
virtual void gui_phone_toolbox(PhoneDrawingProgramScreen& t) override;
|
||||||
virtual void right_click_popup_gui(Toolbar& t, Vector2f popupPos) override;
|
virtual void right_click_popup_gui(Toolbar& t, Vector2f popupPos) override;
|
||||||
virtual void erase_component(CanvasComponentContainer::ObjInfo* erasedComp) override;
|
virtual void erase_component(CanvasComponentContainer::ObjInfo* erasedComp) override;
|
||||||
virtual void tool_update() override;
|
virtual void tool_update() override;
|
||||||
|
|
|
||||||
|
|
@ -42,6 +42,20 @@ void EyeDropperTool::gui_toolbox(Toolbar& t) {
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void EyeDropperTool::gui_phone_toolbox(PhoneDrawingProgramScreen& t) {
|
||||||
|
using namespace GUIStuff;
|
||||||
|
using namespace ElementHelpers;
|
||||||
|
|
||||||
|
auto& gui = drawP.world.main.g.gui;
|
||||||
|
auto& selectingStrokeColor = drawP.world.main.toolConfig.eyeDropper.selectingStrokeColor;
|
||||||
|
gui.new_id("Color select tool", [&] {
|
||||||
|
radio_button_selector<bool>(gui, "Stroke type", &selectingStrokeColor, {
|
||||||
|
{"Stroke Color", true},
|
||||||
|
{"Fill Color", false}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
void EyeDropperTool::right_click_popup_gui(Toolbar& t, Vector2f popupPos) {
|
void EyeDropperTool::right_click_popup_gui(Toolbar& t, Vector2f popupPos) {
|
||||||
t.paint_popup(popupPos);
|
t.paint_popup(popupPos);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -8,6 +8,7 @@ class EyeDropperTool : public DrawingProgramToolBase {
|
||||||
EyeDropperTool(DrawingProgram& initDrawP);
|
EyeDropperTool(DrawingProgram& initDrawP);
|
||||||
virtual DrawingProgramToolType get_type() override;
|
virtual DrawingProgramToolType get_type() override;
|
||||||
virtual void gui_toolbox(Toolbar& t) override;
|
virtual void gui_toolbox(Toolbar& t) override;
|
||||||
|
virtual void gui_phone_toolbox(PhoneDrawingProgramScreen& t) override;
|
||||||
virtual void right_click_popup_gui(Toolbar& t, Vector2f popupPos) override;
|
virtual void right_click_popup_gui(Toolbar& t, Vector2f popupPos) override;
|
||||||
virtual void tool_update() override;
|
virtual void tool_update() override;
|
||||||
virtual void erase_component(CanvasComponentContainer::ObjInfo* erasedComp) override;
|
virtual void erase_component(CanvasComponentContainer::ObjInfo* erasedComp) override;
|
||||||
|
|
|
||||||
|
|
@ -161,6 +161,51 @@ void GridModifyTool::gui_toolbox(Toolbar& t) {
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void GridModifyTool::gui_phone_toolbox(PhoneDrawingProgramScreen& t) {
|
||||||
|
using namespace GUIStuff;
|
||||||
|
using namespace ElementHelpers;
|
||||||
|
|
||||||
|
auto& gui = drawP.world.main.g.gui;
|
||||||
|
|
||||||
|
gui.new_id("Grid modify tool", [&] {
|
||||||
|
NetworkingObjects::NetObjTemporaryPtr<WorldGrid> gLock = grid.lock();
|
||||||
|
if(gLock) {
|
||||||
|
WorldGrid& g = *gLock;
|
||||||
|
input_text_field(gui, "grid name", "Name", &g.name);
|
||||||
|
checkbox_boolean_field(gui, "Visible", "Visible", &g.visible);
|
||||||
|
checkbox_boolean_field(gui, "Display in Front", "Display in front of canvas", &g.displayInFront);
|
||||||
|
std::vector<std::string> listOfGridTypes = {
|
||||||
|
"Circle Points",
|
||||||
|
"Square Points",
|
||||||
|
"Square Lines",
|
||||||
|
"Horizontal Lines"
|
||||||
|
};
|
||||||
|
left_to_right_line_layout(gui, [&]() {
|
||||||
|
text_label(gui, "Type");
|
||||||
|
gui.element<DropDown<WorldGrid::GridType>>("filepicker select type", &g.gridType, listOfGridTypes);
|
||||||
|
});
|
||||||
|
input_scalar_field<uint32_t>(gui, "Subdivisions", "Subdivisions", &g.subdivisions, 1, 10, {
|
||||||
|
.onEdit = [&] { g.set_subdivisions(g.subdivisions); }
|
||||||
|
});
|
||||||
|
checkbox_boolean_field(gui, "Subdivide outwards", "Subdivide when zooming out", &g.removeDivisionsOutwards, [&] {
|
||||||
|
g.set_remove_divisions_outwards(g.removeDivisionsOutwards);
|
||||||
|
});
|
||||||
|
auto bounded = std::make_shared<bool>(g.bounds.has_value());
|
||||||
|
checkbox_boolean_field(gui, "Bounded", "Bounded", bounded.get(), [&, bounded] {
|
||||||
|
if(*bounded) {
|
||||||
|
SCollision::AABB<WorldScalar> newBounds;
|
||||||
|
newBounds.min = g.offset - drawP.world.drawData.cam.c.dir_from_space(drawP.world.main.window.size.cast<float>() * 0.3f);
|
||||||
|
newBounds.max = g.offset + drawP.world.drawData.cam.c.dir_from_space(drawP.world.main.window.size.cast<float>() * 0.3f);
|
||||||
|
g.bounds = newBounds;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
g.bounds = std::nullopt;
|
||||||
|
});
|
||||||
|
checkbox_boolean_field(gui, "Show Coordinates", "Show Coordinates (visible\nwhen canvas isn't rotated)", &g.showCoordinates);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
void GridModifyTool::right_click_popup_gui(Toolbar& t, Vector2f popupPos) {
|
void GridModifyTool::right_click_popup_gui(Toolbar& t, Vector2f popupPos) {
|
||||||
t.paint_popup(popupPos);
|
t.paint_popup(popupPos);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -10,6 +10,7 @@ class GridModifyTool : public DrawingProgramToolBase {
|
||||||
GridModifyTool(DrawingProgram& initDrawP);
|
GridModifyTool(DrawingProgram& initDrawP);
|
||||||
void set_grid(const NetworkingObjects::NetObjWeakPtr<WorldGrid>& newGrid);
|
void set_grid(const NetworkingObjects::NetObjWeakPtr<WorldGrid>& newGrid);
|
||||||
virtual DrawingProgramToolType get_type() override;
|
virtual DrawingProgramToolType get_type() override;
|
||||||
|
virtual void gui_phone_toolbox(PhoneDrawingProgramScreen& t) override;
|
||||||
virtual void gui_toolbox(Toolbar& t) override;
|
virtual void gui_toolbox(Toolbar& t) override;
|
||||||
virtual void right_click_popup_gui(Toolbar& t, Vector2f popupPos) override;
|
virtual void right_click_popup_gui(Toolbar& t, Vector2f popupPos) override;
|
||||||
virtual void tool_update() override;
|
virtual void tool_update() override;
|
||||||
|
|
|
||||||
|
|
@ -47,6 +47,13 @@ void LassoSelectTool::gui_toolbox(Toolbar& t) {
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void LassoSelectTool::gui_phone_toolbox(PhoneDrawingProgramScreen& t) {
|
||||||
|
auto& gui = drawP.world.main.g.gui;
|
||||||
|
gui.new_id("lasso select tool", [&] {
|
||||||
|
drawP.selection.phone_selection_gui(t);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
void LassoSelectTool::right_click_popup_gui(Toolbar& t, Vector2f popupPos) {
|
void LassoSelectTool::right_click_popup_gui(Toolbar& t, Vector2f popupPos) {
|
||||||
drawP.selection_action_menu(popupPos);
|
drawP.selection_action_menu(popupPos);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -12,6 +12,7 @@ class LassoSelectTool : public DrawingProgramToolBase {
|
||||||
LassoSelectTool(DrawingProgram& initDrawP);
|
LassoSelectTool(DrawingProgram& initDrawP);
|
||||||
virtual DrawingProgramToolType get_type() override;
|
virtual DrawingProgramToolType get_type() override;
|
||||||
virtual void gui_toolbox(Toolbar& t) override;
|
virtual void gui_toolbox(Toolbar& t) override;
|
||||||
|
virtual void gui_phone_toolbox(PhoneDrawingProgramScreen& t) override;
|
||||||
virtual void right_click_popup_gui(Toolbar& t, Vector2f popupPos) override;
|
virtual void right_click_popup_gui(Toolbar& t, Vector2f popupPos) override;
|
||||||
virtual void erase_component(CanvasComponentContainer::ObjInfo* erasedComp) override;
|
virtual void erase_component(CanvasComponentContainer::ObjInfo* erasedComp) override;
|
||||||
virtual void tool_update() override;
|
virtual void tool_update() override;
|
||||||
|
|
|
||||||
|
|
@ -30,6 +30,17 @@ void LineDrawTool::gui_toolbox(Toolbar& t) {
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void LineDrawTool::gui_phone_toolbox(PhoneDrawingProgramScreen& t) {
|
||||||
|
using namespace GUIStuff;
|
||||||
|
using namespace ElementHelpers;
|
||||||
|
auto& gui = drawP.world.main.g.gui;
|
||||||
|
auto& toolConfig = drawP.world.main.toolConfig;
|
||||||
|
gui.new_id("rect draw tool", [&] {
|
||||||
|
toolConfig.relative_width_gui(drawP, "Size");
|
||||||
|
checkbox_boolean_field(gui, "hasroundcaps", "Round Caps", &toolConfig.lineDraw.hasRoundCaps);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
void LineDrawTool::input_mouse_button_on_canvas_callback(const InputManager::MouseButtonCallbackArgs& button) {
|
void LineDrawTool::input_mouse_button_on_canvas_callback(const InputManager::MouseButtonCallbackArgs& button) {
|
||||||
if(button.button == InputManager::MouseButton::LEFT) {
|
if(button.button == InputManager::MouseButton::LEFT) {
|
||||||
auto& toolConfig = drawP.world.main.toolConfig;
|
auto& toolConfig = drawP.world.main.toolConfig;
|
||||||
|
|
|
||||||
|
|
@ -10,6 +10,7 @@ class LineDrawTool : public DrawingProgramToolBase {
|
||||||
LineDrawTool(DrawingProgram& initDrawP);
|
LineDrawTool(DrawingProgram& initDrawP);
|
||||||
virtual DrawingProgramToolType get_type() override;
|
virtual DrawingProgramToolType get_type() override;
|
||||||
virtual void gui_toolbox(Toolbar& t) override;
|
virtual void gui_toolbox(Toolbar& t) override;
|
||||||
|
virtual void gui_phone_toolbox(PhoneDrawingProgramScreen& t) override;
|
||||||
virtual void right_click_popup_gui(Toolbar& t, Vector2f popupPos) override;
|
virtual void right_click_popup_gui(Toolbar& t, Vector2f popupPos) override;
|
||||||
virtual void erase_component(CanvasComponentContainer::ObjInfo* erasedComp) override;
|
virtual void erase_component(CanvasComponentContainer::ObjInfo* erasedComp) override;
|
||||||
virtual void tool_update() override;
|
virtual void tool_update() override;
|
||||||
|
|
|
||||||
|
|
@ -23,6 +23,13 @@ void PanCanvasTool::gui_toolbox(Toolbar& t) {
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void PanCanvasTool::gui_phone_toolbox(PhoneDrawingProgramScreen& t) {
|
||||||
|
auto& gui = drawP.world.main.g.gui;
|
||||||
|
gui.new_id("Pan canvas tool", [&] {
|
||||||
|
GUIStuff::ElementHelpers::text_label_centered(gui, "Pan tool");
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
void PanCanvasTool::right_click_popup_gui(Toolbar& t, Vector2f popupPos) {
|
void PanCanvasTool::right_click_popup_gui(Toolbar& t, Vector2f popupPos) {
|
||||||
drawP.selection_action_menu(popupPos);
|
drawP.selection_action_menu(popupPos);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -8,6 +8,7 @@ class PanCanvasTool : public DrawingProgramToolBase {
|
||||||
PanCanvasTool(DrawingProgram& initDrawP);
|
PanCanvasTool(DrawingProgram& initDrawP);
|
||||||
virtual DrawingProgramToolType get_type() override;
|
virtual DrawingProgramToolType get_type() override;
|
||||||
virtual void gui_toolbox(Toolbar& t) override;
|
virtual void gui_toolbox(Toolbar& t) override;
|
||||||
|
virtual void gui_phone_toolbox(PhoneDrawingProgramScreen& t) override;
|
||||||
virtual void right_click_popup_gui(Toolbar& t, Vector2f popupPos) override;
|
virtual void right_click_popup_gui(Toolbar& t, Vector2f popupPos) override;
|
||||||
virtual void erase_component(CanvasComponentContainer::ObjInfo* erasedComp) override;
|
virtual void erase_component(CanvasComponentContainer::ObjInfo* erasedComp) override;
|
||||||
virtual void tool_update() override;
|
virtual void tool_update() override;
|
||||||
|
|
|
||||||
|
|
@ -39,6 +39,26 @@ void RectDrawTool::gui_toolbox(Toolbar& t) {
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void RectDrawTool::gui_phone_toolbox(PhoneDrawingProgramScreen& t) {
|
||||||
|
using namespace GUIStuff;
|
||||||
|
using namespace ElementHelpers;
|
||||||
|
|
||||||
|
auto& gui = drawP.world.main.g.gui;
|
||||||
|
auto& toolConfig = drawP.world.main.toolConfig;
|
||||||
|
auto& fillStrokeMode = toolConfig.rectDraw.fillStrokeMode;
|
||||||
|
auto& relativeRadiusWidth = toolConfig.rectDraw.relativeRadiusWidth;
|
||||||
|
gui.new_id("rect draw tool", [&] {
|
||||||
|
slider_scalar_field(gui, "relradiuswidth", "Corner Radius", &relativeRadiusWidth, 0.0f, 40.0f);
|
||||||
|
radio_button_selector(gui, "fill type", &fillStrokeMode, {
|
||||||
|
{"Fill only", 0},
|
||||||
|
{"Outline only", 1},
|
||||||
|
{"Fill and Outline", 2}
|
||||||
|
});
|
||||||
|
if(fillStrokeMode == 1 || fillStrokeMode == 2)
|
||||||
|
toolConfig.relative_width_gui(drawP, "Outline Size");
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
void RectDrawTool::input_mouse_button_on_canvas_callback(const InputManager::MouseButtonCallbackArgs& button) {
|
void RectDrawTool::input_mouse_button_on_canvas_callback(const InputManager::MouseButtonCallbackArgs& button) {
|
||||||
if(button.button == InputManager::MouseButton::LEFT) {
|
if(button.button == InputManager::MouseButton::LEFT) {
|
||||||
if(button.down && drawP.layerMan.is_a_layer_being_edited() && !objInfoBeingEdited && !drawP.world.main.g.gui.cursor_obstructed()) {
|
if(button.down && drawP.layerMan.is_a_layer_being_edited() && !objInfoBeingEdited && !drawP.world.main.g.gui.cursor_obstructed()) {
|
||||||
|
|
|
||||||
|
|
@ -10,6 +10,7 @@ class RectDrawTool : public DrawingProgramToolBase {
|
||||||
RectDrawTool(DrawingProgram& initDrawP);
|
RectDrawTool(DrawingProgram& initDrawP);
|
||||||
virtual DrawingProgramToolType get_type() override;
|
virtual DrawingProgramToolType get_type() override;
|
||||||
virtual void gui_toolbox(Toolbar& t) override;
|
virtual void gui_toolbox(Toolbar& t) override;
|
||||||
|
virtual void gui_phone_toolbox(PhoneDrawingProgramScreen& t) override;
|
||||||
virtual void right_click_popup_gui(Toolbar& t, Vector2f popupPos) override;
|
virtual void right_click_popup_gui(Toolbar& t, Vector2f popupPos) override;
|
||||||
virtual void erase_component(CanvasComponentContainer::ObjInfo* erasedComp) override;
|
virtual void erase_component(CanvasComponentContainer::ObjInfo* erasedComp) override;
|
||||||
virtual void tool_update() override;
|
virtual void tool_update() override;
|
||||||
|
|
|
||||||
|
|
@ -26,6 +26,13 @@ void RectSelectTool::gui_toolbox(Toolbar& t) {
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void RectSelectTool::gui_phone_toolbox(PhoneDrawingProgramScreen& t) {
|
||||||
|
auto& gui = drawP.world.main.g.gui;
|
||||||
|
gui.new_id("rect select tool", [&] {
|
||||||
|
drawP.selection.phone_selection_gui(t);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
void RectSelectTool::input_key_callback(const InputManager::KeyCallbackArgs& key) {
|
void RectSelectTool::input_key_callback(const InputManager::KeyCallbackArgs& key) {
|
||||||
drawP.selection.input_key_callback_modify_selection(key);
|
drawP.selection.input_key_callback_modify_selection(key);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -10,6 +10,7 @@ class RectSelectTool : public DrawingProgramToolBase {
|
||||||
RectSelectTool(DrawingProgram& initDrawP);
|
RectSelectTool(DrawingProgram& initDrawP);
|
||||||
virtual DrawingProgramToolType get_type() override;
|
virtual DrawingProgramToolType get_type() override;
|
||||||
virtual void gui_toolbox(Toolbar& t) override;
|
virtual void gui_toolbox(Toolbar& t) override;
|
||||||
|
virtual void gui_phone_toolbox(PhoneDrawingProgramScreen& t) override;
|
||||||
virtual void erase_component(CanvasComponentContainer::ObjInfo* erasedComp) override;
|
virtual void erase_component(CanvasComponentContainer::ObjInfo* erasedComp) override;
|
||||||
virtual void right_click_popup_gui(Toolbar& t, Vector2f popupPos) override;
|
virtual void right_click_popup_gui(Toolbar& t, Vector2f popupPos) override;
|
||||||
virtual void tool_update() override;
|
virtual void tool_update() override;
|
||||||
|
|
|
||||||
|
|
@ -106,6 +106,16 @@ void ScreenshotTool::gui_toolbox(Toolbar& t) {
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void ScreenshotTool::gui_phone_toolbox(PhoneDrawingProgramScreen& t) {
|
||||||
|
using namespace GUIStuff;
|
||||||
|
using namespace ElementHelpers;
|
||||||
|
|
||||||
|
auto& gui = drawP.world.main.g.gui;
|
||||||
|
gui.new_id("screenshot tool", [&] {
|
||||||
|
text_label_centered(gui, "Screenshot");
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
void ScreenshotTool::right_click_popup_gui(Toolbar& t, Vector2f popupPos) {
|
void ScreenshotTool::right_click_popup_gui(Toolbar& t, Vector2f popupPos) {
|
||||||
t.paint_popup(popupPos);
|
t.paint_popup(popupPos);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -13,6 +13,7 @@ class ScreenshotTool : public DrawingProgramToolBase {
|
||||||
ScreenshotTool(DrawingProgram& initDrawP);
|
ScreenshotTool(DrawingProgram& initDrawP);
|
||||||
virtual DrawingProgramToolType get_type() override;
|
virtual DrawingProgramToolType get_type() override;
|
||||||
virtual void gui_toolbox(Toolbar& t) override;
|
virtual void gui_toolbox(Toolbar& t) override;
|
||||||
|
virtual void gui_phone_toolbox(PhoneDrawingProgramScreen& t) override;
|
||||||
virtual void right_click_popup_gui(Toolbar& t, Vector2f popupPos) override;
|
virtual void right_click_popup_gui(Toolbar& t, Vector2f popupPos) override;
|
||||||
virtual void erase_component(CanvasComponentContainer::ObjInfo* erasedComp) override;
|
virtual void erase_component(CanvasComponentContainer::ObjInfo* erasedComp) override;
|
||||||
virtual void tool_update() override;
|
virtual void tool_update() override;
|
||||||
|
|
|
||||||
|
|
@ -26,6 +26,13 @@ void TextBoxTool::gui_toolbox(Toolbar& t) {
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void TextBoxTool::gui_phone_toolbox(PhoneDrawingProgramScreen& t) {
|
||||||
|
auto& gui = drawP.world.main.g.gui;
|
||||||
|
gui.new_id("textbox tool", [&] {
|
||||||
|
GUIStuff::ElementHelpers::text_label_centered(gui, "Place textbox");
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
void TextBoxTool::input_mouse_button_on_canvas_callback(const InputManager::MouseButtonCallbackArgs& button) {
|
void TextBoxTool::input_mouse_button_on_canvas_callback(const InputManager::MouseButtonCallbackArgs& button) {
|
||||||
if(button.button == InputManager::MouseButton::LEFT) {
|
if(button.button == InputManager::MouseButton::LEFT) {
|
||||||
if(button.down && drawP.layerMan.is_a_layer_being_edited() && !objInfoBeingEdited && !drawP.world.main.g.gui.cursor_obstructed()) {
|
if(button.down && drawP.layerMan.is_a_layer_being_edited() && !objInfoBeingEdited && !drawP.world.main.g.gui.cursor_obstructed()) {
|
||||||
|
|
|
||||||
|
|
@ -10,6 +10,7 @@ class TextBoxTool : public DrawingProgramToolBase {
|
||||||
TextBoxTool(DrawingProgram& initDrawP);
|
TextBoxTool(DrawingProgram& initDrawP);
|
||||||
virtual DrawingProgramToolType get_type() override;
|
virtual DrawingProgramToolType get_type() override;
|
||||||
virtual void gui_toolbox(Toolbar& t) override;
|
virtual void gui_toolbox(Toolbar& t) override;
|
||||||
|
virtual void gui_phone_toolbox(PhoneDrawingProgramScreen& t) override;
|
||||||
virtual void right_click_popup_gui(Toolbar& t, Vector2f popupPos) override;
|
virtual void right_click_popup_gui(Toolbar& t, Vector2f popupPos) override;
|
||||||
virtual void erase_component(CanvasComponentContainer::ObjInfo* erasedComp) override;
|
virtual void erase_component(CanvasComponentContainer::ObjInfo* erasedComp) override;
|
||||||
virtual void tool_update() override;
|
virtual void tool_update() override;
|
||||||
|
|
|
||||||
|
|
@ -23,6 +23,13 @@ void ZoomCanvasTool::gui_toolbox(Toolbar& t) {
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void ZoomCanvasTool::gui_phone_toolbox(PhoneDrawingProgramScreen& t) {
|
||||||
|
auto& gui = drawP.world.main.g.gui;
|
||||||
|
gui.new_id("Zoom canvas tool", [&] {
|
||||||
|
GUIStuff::ElementHelpers::text_label_centered(gui, "Zoom tool");
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
void ZoomCanvasTool::right_click_popup_gui(Toolbar& t, Vector2f popupPos) {
|
void ZoomCanvasTool::right_click_popup_gui(Toolbar& t, Vector2f popupPos) {
|
||||||
drawP.selection_action_menu(popupPos);
|
drawP.selection_action_menu(popupPos);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -8,6 +8,7 @@ class ZoomCanvasTool : public DrawingProgramToolBase {
|
||||||
ZoomCanvasTool(DrawingProgram& initDrawP);
|
ZoomCanvasTool(DrawingProgram& initDrawP);
|
||||||
virtual DrawingProgramToolType get_type() override;
|
virtual DrawingProgramToolType get_type() override;
|
||||||
virtual void gui_toolbox(Toolbar& t) override;
|
virtual void gui_toolbox(Toolbar& t) override;
|
||||||
|
virtual void gui_phone_toolbox(PhoneDrawingProgramScreen& t) override;
|
||||||
virtual void right_click_popup_gui(Toolbar& t, Vector2f popupPos) override;
|
virtual void right_click_popup_gui(Toolbar& t, Vector2f popupPos) override;
|
||||||
virtual void erase_component(CanvasComponentContainer::ObjInfo* erasedComp) override;
|
virtual void erase_component(CanvasComponentContainer::ObjInfo* erasedComp) override;
|
||||||
virtual void tool_update() override;
|
virtual void tool_update() override;
|
||||||
|
|
|
||||||
|
|
@ -22,7 +22,7 @@ void CheckBox::layout(const Clay_ElementId& id, const std::function<bool()>& isT
|
||||||
}
|
}
|
||||||
|
|
||||||
void CheckBox::update() {
|
void CheckBox::update() {
|
||||||
if(smooth_two_way_animation_time_check_for_change(hoverAnimation, gui.io.deltaTime, mouseHovering, CHECKBOX_ANIMATION_TIME))
|
if(smooth_two_way_animation_time_check_for_change(hoverAnimation, gui.io.deltaTime, is_hovering_animation(), CHECKBOX_ANIMATION_TIME))
|
||||||
gui.invalidate_draw_element(this);
|
gui.invalidate_draw_element(this);
|
||||||
if(oldIsTicked != isTicked()) {
|
if(oldIsTicked != isTicked()) {
|
||||||
gui.invalidate_draw_element(this);
|
gui.invalidate_draw_element(this);
|
||||||
|
|
@ -30,9 +30,26 @@ void CheckBox::update() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool CheckBox::is_hovering_animation() {
|
||||||
|
return mouseHovering && (!gui.last_interaction_is_touch() || isHeld);
|
||||||
|
}
|
||||||
|
|
||||||
void CheckBox::input_mouse_button_callback(const InputManager::MouseButtonCallbackArgs& button) {
|
void CheckBox::input_mouse_button_callback(const InputManager::MouseButtonCallbackArgs& button) {
|
||||||
if(mouseHovering && button.button == InputManager::MouseButton::LEFT && button.down)
|
if(mouseHovering && button.button == InputManager::MouseButton::LEFT && button.down) {
|
||||||
gui.set_post_callback_func([&](){if(onClick) onClick();});
|
gui.set_post_callback_func([&](){if(onClick) onClick();});
|
||||||
|
isHeld = true;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
isHeld = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
void CheckBox::input_finger_touch_callback(const InputManager::FingerTouchCallbackArgs& touch) {
|
||||||
|
if(mouseHovering && touch.down) {
|
||||||
|
gui.set_post_callback_func([&](){if(onClick) onClick();});
|
||||||
|
isHeld = true;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
isHeld = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
void CheckBox::clay_draw(SkCanvas* canvas, UpdateInputData& io, Clay_RenderCommand* command, bool skiaAA) {
|
void CheckBox::clay_draw(SkCanvas* canvas, UpdateInputData& io, Clay_RenderCommand* command, bool skiaAA) {
|
||||||
|
|
@ -53,7 +70,7 @@ void CheckBox::clay_draw(SkCanvas* canvas, UpdateInputData& io, Clay_RenderComma
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
SkRect checkBox = SkRect::MakeLTRB(-0.45f, -0.45f, 0.45f, 0.45f);
|
SkRect checkBox = SkRect::MakeLTRB(-0.45f, -0.45f, 0.45f, 0.45f);
|
||||||
p.setColor4f(convert_vec4<SkColor4f>(mouseHovering ? io.theme->fillColor1 : io.theme->fillColor2));
|
p.setColor4f(convert_vec4<SkColor4f>(is_hovering_animation() ? io.theme->fillColor1 : io.theme->fillColor2));
|
||||||
p.setStyle(SkPaint::kStroke_Style);
|
p.setStyle(SkPaint::kStroke_Style);
|
||||||
p.setStrokeWidth(0.15f);
|
p.setStrokeWidth(0.15f);
|
||||||
canvas->drawRoundRect(checkBox, 0.25f, 0.25f, p);
|
canvas->drawRoundRect(checkBox, 0.25f, 0.25f, p);
|
||||||
|
|
|
||||||
|
|
@ -9,6 +9,7 @@ class CheckBox : public Element {
|
||||||
|
|
||||||
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_mouse_button_callback(const InputManager::MouseButtonCallbackArgs& button) override;
|
virtual void input_mouse_button_callback(const InputManager::MouseButtonCallbackArgs& button) override;
|
||||||
|
virtual void input_finger_touch_callback(const InputManager::FingerTouchCallbackArgs& touch) override;
|
||||||
virtual void update() override;
|
virtual void update() override;
|
||||||
|
|
||||||
void layout(const Clay_ElementId& id, const std::function<bool()>& isTicked, const std::function<void()>& onClick);
|
void layout(const Clay_ElementId& id, const std::function<bool()>& isTicked, const std::function<void()>& onClick);
|
||||||
|
|
@ -16,6 +17,8 @@ class CheckBox : public Element {
|
||||||
static constexpr float CHECKBOX_ANIMATION_TIME = 0.3;
|
static constexpr float CHECKBOX_ANIMATION_TIME = 0.3;
|
||||||
float hoverAnimation = 0.0;
|
float hoverAnimation = 0.0;
|
||||||
bool oldIsTicked = false;
|
bool oldIsTicked = false;
|
||||||
|
bool isHeld = false;
|
||||||
|
bool is_hovering_animation();
|
||||||
std::function<bool()> isTicked;
|
std::function<bool()> isTicked;
|
||||||
std::function<void()> onClick;
|
std::function<void()> onClick;
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,7 @@
|
||||||
#pragma once
|
#pragma once
|
||||||
#include "Element.hpp"
|
#include "Element.hpp"
|
||||||
#include "../GUIManager.hpp"
|
#include "../GUIManager.hpp"
|
||||||
|
#include "../../TimePoint.hpp"
|
||||||
|
|
||||||
namespace GUIStuff {
|
namespace GUIStuff {
|
||||||
|
|
||||||
|
|
@ -35,7 +36,7 @@ template <typename T> class NumberSlider : public Element {
|
||||||
|
|
||||||
virtual void update() override {
|
virtual void update() override {
|
||||||
smooth_two_way_animation_time(dd.holdAnimation, gui.io.deltaTime, dd.isHeld, HOLD_ANIMATION_TIME);
|
smooth_two_way_animation_time(dd.holdAnimation, gui.io.deltaTime, dd.isHeld, HOLD_ANIMATION_TIME);
|
||||||
smooth_two_way_animation_time(dd.hoverAnimation, gui.io.deltaTime, mouseHovering, gui.io.theme->hoverExpandTime);
|
smooth_two_way_animation_time(dd.hoverAnimation, gui.io.deltaTime, mouseHovering && !gui.last_interaction_is_touch(), gui.io.theme->hoverExpandTime);
|
||||||
if(oldDD != dd) {
|
if(oldDD != dd) {
|
||||||
gui.invalidate_draw_element(this, {
|
gui.invalidate_draw_element(this, {
|
||||||
.top = 10.0f,
|
.top = 10.0f,
|
||||||
|
|
@ -113,6 +114,23 @@ template <typename T> class NumberSlider : public Element {
|
||||||
update_slider_pos(motion.pos, false);
|
update_slider_pos(motion.pos, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
virtual void input_finger_touch_callback(const InputManager::FingerTouchCallbackArgs& touch) override {
|
||||||
|
bool oldIsHeld = dd.isHeld;
|
||||||
|
dd.isHeld = mouseHovering && touch.down;
|
||||||
|
if(oldIsHeld && !dd.isHeld) {
|
||||||
|
gui.set_post_callback_func([&] {
|
||||||
|
if(config.onRelease) config.onRelease();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
else if(dd.isHeld && boundingBox.has_value())
|
||||||
|
update_slider_pos(touch.pos, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
virtual void input_finger_motion_callback(const InputManager::FingerMotionCallbackArgs& motion) override {
|
||||||
|
if(dd.isHeld && boundingBox.has_value())
|
||||||
|
update_slider_pos(motion.pos, false);
|
||||||
|
}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void update_slider_pos(const Vector2f& p, bool justHeld) {
|
void update_slider_pos(const Vector2f& p, bool justHeld) {
|
||||||
gui.set_post_callback_func([&, p, justHeld] {
|
gui.set_post_callback_func([&, p, justHeld] {
|
||||||
|
|
|
||||||
|
|
@ -20,7 +20,7 @@ void RadioButton::layout(const Clay_ElementId& id, const std::function<bool()>&
|
||||||
}
|
}
|
||||||
|
|
||||||
void RadioButton::update() {
|
void RadioButton::update() {
|
||||||
if(smooth_two_way_animation_time_check_for_change(hoverAnimation, gui.io.deltaTime, mouseHovering, RADIOBUTTON_ANIMATION_TIME))
|
if(smooth_two_way_animation_time_check_for_change(hoverAnimation, gui.io.deltaTime, is_hovering_animation(), RADIOBUTTON_ANIMATION_TIME))
|
||||||
gui.invalidate_draw_element(this);
|
gui.invalidate_draw_element(this);
|
||||||
if(oldIsTicked != isTicked()) {
|
if(oldIsTicked != isTicked()) {
|
||||||
gui.invalidate_draw_element(this);
|
gui.invalidate_draw_element(this);
|
||||||
|
|
@ -28,9 +28,26 @@ void RadioButton::update() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool RadioButton::is_hovering_animation() {
|
||||||
|
return mouseHovering && (!gui.last_interaction_is_touch() || isHeld);
|
||||||
|
}
|
||||||
|
|
||||||
void RadioButton::input_mouse_button_callback(const InputManager::MouseButtonCallbackArgs& button) {
|
void RadioButton::input_mouse_button_callback(const InputManager::MouseButtonCallbackArgs& button) {
|
||||||
if(mouseHovering && button.button == InputManager::MouseButton::LEFT && button.down)
|
if(mouseHovering && button.button == InputManager::MouseButton::LEFT && button.down) {
|
||||||
gui.set_post_callback_func([&] { if(onClick) onClick(); });
|
gui.set_post_callback_func([&] { if(onClick) onClick(); });
|
||||||
|
isHeld = true;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
isHeld = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
void RadioButton::input_finger_touch_callback(const InputManager::FingerTouchCallbackArgs& touch) {
|
||||||
|
if(mouseHovering && touch.down) {
|
||||||
|
gui.set_post_callback_func([&] { if(onClick) onClick(); });
|
||||||
|
isHeld = true;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
isHeld = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
void RadioButton::clay_draw(SkCanvas* canvas, UpdateInputData& io, Clay_RenderCommand* command, bool skiaAA) {
|
void RadioButton::clay_draw(SkCanvas* canvas, UpdateInputData& io, Clay_RenderCommand* command, bool skiaAA) {
|
||||||
|
|
@ -62,7 +79,7 @@ void RadioButton::clay_draw(SkCanvas* canvas, UpdateInputData& io, Clay_RenderCo
|
||||||
else {
|
else {
|
||||||
SkPaint p;
|
SkPaint p;
|
||||||
p.setAntiAlias(skiaAA);
|
p.setAntiAlias(skiaAA);
|
||||||
p.setColor4f(convert_vec4<SkColor4f>(mouseHovering ? io.theme->fillColor1 : io.theme->backColor2));
|
p.setColor4f(convert_vec4<SkColor4f>(is_hovering_animation() ? io.theme->fillColor1 : io.theme->backColor2));
|
||||||
p.setStyle(SkPaint::kStroke_Style);
|
p.setStyle(SkPaint::kStroke_Style);
|
||||||
p.setStrokeWidth(0.15f);
|
p.setStrokeWidth(0.15f);
|
||||||
canvas->drawCircle(0.0f, 0.0f, 0.5f, p);
|
canvas->drawCircle(0.0f, 0.0f, 0.5f, p);
|
||||||
|
|
|
||||||
|
|
@ -8,12 +8,15 @@ class RadioButton : public Element {
|
||||||
RadioButton(GUIManager& gui);
|
RadioButton(GUIManager& gui);
|
||||||
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_mouse_button_callback(const InputManager::MouseButtonCallbackArgs& button) override;
|
virtual void input_mouse_button_callback(const InputManager::MouseButtonCallbackArgs& button) override;
|
||||||
|
virtual void input_finger_touch_callback(const InputManager::FingerTouchCallbackArgs& touch) override;
|
||||||
virtual void update() override;
|
virtual void update() override;
|
||||||
|
|
||||||
void layout(const Clay_ElementId& id, const std::function<bool()>& isTicked, const std::function<void()>& onClick);
|
void layout(const Clay_ElementId& id, const std::function<bool()>& isTicked, const std::function<void()>& onClick);
|
||||||
private:
|
private:
|
||||||
static constexpr float RADIOBUTTON_ANIMATION_TIME = 0.3;
|
static constexpr float RADIOBUTTON_ANIMATION_TIME = 0.3;
|
||||||
bool oldIsTicked = false;
|
bool oldIsTicked = false;
|
||||||
|
bool isHeld = false;
|
||||||
|
bool is_hovering_animation();
|
||||||
float hoverAnimation = 0.0;
|
float hoverAnimation = 0.0;
|
||||||
std::function<bool()> isTicked;
|
std::function<bool()> isTicked;
|
||||||
std::function<void()> onClick;
|
std::function<void()> onClick;
|
||||||
|
|
|
||||||
|
|
@ -27,6 +27,7 @@ GUIManager::GUIManager()
|
||||||
Clay_SetMeasureTextFunction(clay_skia_measure_text, this);
|
Clay_SetMeasureTextFunction(clay_skia_measure_text, this);
|
||||||
setToLayout = true;
|
setToLayout = true;
|
||||||
postCallbackFuncIsHighPriority = false;
|
postCallbackFuncIsHighPriority = false;
|
||||||
|
lastInteractionIsTouch = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
Clay_Dimensions GUIManager::clay_skia_measure_text(Clay_StringSlice str, Clay_TextElementConfig* config, void* userData) {
|
Clay_Dimensions GUIManager::clay_skia_measure_text(Clay_StringSlice str, Clay_TextElementConfig* config, void* userData) {
|
||||||
|
|
@ -671,6 +672,10 @@ void GUIManager::invalidate_draw_in_area(const SCollision::AABB<float>& bb) {
|
||||||
invalidDrawBB = bb;
|
invalidDrawBB = bb;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool GUIManager::last_interaction_is_touch() {
|
||||||
|
return lastInteractionIsTouch;
|
||||||
|
}
|
||||||
|
|
||||||
bool GUIManager::cursor_obstructed() const {
|
bool GUIManager::cursor_obstructed() const {
|
||||||
return cursorObstructed;
|
return cursorObstructed;
|
||||||
}
|
}
|
||||||
|
|
@ -702,6 +707,7 @@ void GUIManager::input_key_callback(const InputManager::KeyCallbackArgs& key) {
|
||||||
|
|
||||||
void GUIManager::input_mouse_button_callback(InputManager::MouseButtonCallbackArgs button) {
|
void GUIManager::input_mouse_button_callback(InputManager::MouseButtonCallbackArgs button) {
|
||||||
if(button.deviceType != InputManager::MouseDeviceType::TOUCH) {
|
if(button.deviceType != InputManager::MouseDeviceType::TOUCH) {
|
||||||
|
lastInteractionIsTouch = false;
|
||||||
button.pos /= io.guiScaleMultiplier;
|
button.pos /= io.guiScaleMultiplier;
|
||||||
mouse_callback(button.pos, [&button] (ElementContainer* e) { e->elem->input_mouse_button_callback(button); });
|
mouse_callback(button.pos, [&button] (ElementContainer* e) { e->elem->input_mouse_button_callback(button); });
|
||||||
}
|
}
|
||||||
|
|
@ -709,6 +715,7 @@ void GUIManager::input_mouse_button_callback(InputManager::MouseButtonCallbackAr
|
||||||
|
|
||||||
void GUIManager::input_mouse_motion_callback(InputManager::MouseMotionCallbackArgs motion) {
|
void GUIManager::input_mouse_motion_callback(InputManager::MouseMotionCallbackArgs motion) {
|
||||||
if(motion.deviceType != InputManager::MouseDeviceType::TOUCH) {
|
if(motion.deviceType != InputManager::MouseDeviceType::TOUCH) {
|
||||||
|
lastInteractionIsTouch = false;
|
||||||
motion.pos /= io.guiScaleMultiplier;
|
motion.pos /= io.guiScaleMultiplier;
|
||||||
motion.move /= io.guiScaleMultiplier;
|
motion.move /= io.guiScaleMultiplier;
|
||||||
mouse_callback(motion.pos, [&motion] (ElementContainer* e) { e->elem->input_mouse_motion_callback(motion); });
|
mouse_callback(motion.pos, [&motion] (ElementContainer* e) { e->elem->input_mouse_motion_callback(motion); });
|
||||||
|
|
@ -721,11 +728,13 @@ void GUIManager::input_mouse_wheel_callback(InputManager::MouseWheelCallbackArgs
|
||||||
}
|
}
|
||||||
|
|
||||||
void GUIManager::input_finger_touch_callback(InputManager::FingerTouchCallbackArgs touch) {
|
void GUIManager::input_finger_touch_callback(InputManager::FingerTouchCallbackArgs touch) {
|
||||||
|
lastInteractionIsTouch = true;
|
||||||
touch.pos /= io.guiScaleMultiplier;
|
touch.pos /= io.guiScaleMultiplier;
|
||||||
mouse_callback(touch.pos, [&touch] (ElementContainer* e) { e->elem->input_finger_touch_callback(touch); });
|
mouse_callback(touch.pos, [&touch] (ElementContainer* e) { e->elem->input_finger_touch_callback(touch); });
|
||||||
}
|
}
|
||||||
|
|
||||||
void GUIManager::input_finger_motion_callback(InputManager::FingerMotionCallbackArgs motion) {
|
void GUIManager::input_finger_motion_callback(InputManager::FingerMotionCallbackArgs motion) {
|
||||||
|
lastInteractionIsTouch = true;
|
||||||
motion.pos /= io.guiScaleMultiplier;
|
motion.pos /= io.guiScaleMultiplier;
|
||||||
motion.move /= io.guiScaleMultiplier;
|
motion.move /= io.guiScaleMultiplier;
|
||||||
mouse_callback(motion.pos, [&motion] (ElementContainer* e) { e->elem->input_finger_motion_callback(motion); });
|
mouse_callback(motion.pos, [&motion] (ElementContainer* e) { e->elem->input_finger_motion_callback(motion); });
|
||||||
|
|
|
||||||
|
|
@ -47,6 +47,8 @@ class GUIManager {
|
||||||
void invalidate_draw_element(Element* element, const BorderData& extraPadding = {});
|
void invalidate_draw_element(Element* element, const BorderData& extraPadding = {});
|
||||||
void invalidate_draw_in_area(const SCollision::AABB<float>& bb);
|
void invalidate_draw_in_area(const SCollision::AABB<float>& bb);
|
||||||
|
|
||||||
|
bool last_interaction_is_touch();
|
||||||
|
|
||||||
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);
|
||||||
|
|
||||||
|
|
@ -161,6 +163,7 @@ class GUIManager {
|
||||||
void calculate_new_clip_rect(std::vector<SCollision::AABB<float>>& clipRectStack, std::optional<SCollision::AABB<float>>& clipRect, bool& clipNoDraw);
|
void calculate_new_clip_rect(std::vector<SCollision::AABB<float>>& clipRectStack, std::optional<SCollision::AABB<float>>& clipRect, bool& clipNoDraw);
|
||||||
void clip_rect_transform(SkCanvas* canvas, std::vector<SCollision::AABB<float>>& clipRectStack, std::optional<SCollision::AABB<float>>& clipRect, bool& clipNoDraw);
|
void clip_rect_transform(SkCanvas* canvas, std::vector<SCollision::AABB<float>>& clipRectStack, std::optional<SCollision::AABB<float>>& clipRect, bool& clipNoDraw);
|
||||||
|
|
||||||
|
bool lastInteractionIsTouch;
|
||||||
bool setToLayout;
|
bool setToLayout;
|
||||||
bool setToUpdateInvalidateDrawAreaFromLayout;
|
bool setToUpdateInvalidateDrawAreaFromLayout;
|
||||||
bool cursorObstructed;
|
bool cursorObstructed;
|
||||||
|
|
|
||||||
|
|
@ -27,6 +27,8 @@ void PhoneDrawingProgramScreen::main_display() {
|
||||||
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) },
|
||||||
|
.childGap = main.g.gui.io.theme->childGap1,
|
||||||
|
.childAlignment = {.x = CLAY_ALIGN_X_CENTER},
|
||||||
.layoutDirection = CLAY_TOP_TO_BOTTOM
|
.layoutDirection = CLAY_TOP_TO_BOTTOM
|
||||||
},
|
},
|
||||||
}) {
|
}) {
|
||||||
|
|
@ -77,42 +79,188 @@ void PhoneDrawingProgramScreen::top_toolbar() {
|
||||||
void PhoneDrawingProgramScreen::bottom_toolbar() {
|
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;
|
|
||||||
window_fill_side_bar(gui, {
|
window_fill_side_bar(gui, {
|
||||||
.dir = WindowFillSideBarConfig::Direction::BOTTOM,
|
.dir = WindowFillSideBarConfig::Direction::BOTTOM,
|
||||||
}, [&] {
|
}, [&] {
|
||||||
CLAY_AUTO_ID({
|
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) },
|
||||||
.childAlignment = { .x = CLAY_ALIGN_X_CENTER, .y = CLAY_ALIGN_Y_CENTER},
|
.childGap = io.theme->childGap1,
|
||||||
.layoutDirection = CLAY_LEFT_TO_RIGHT
|
.childAlignment = { .x = CLAY_ALIGN_X_CENTER, .y = CLAY_ALIGN_Y_CENTER}
|
||||||
}
|
}
|
||||||
}) {
|
}) {
|
||||||
gui.element<LayoutElement>("bottom toolbar", [&](LayoutElement*, const Clay_ElementId& lId) {
|
CLAY_AUTO_ID({
|
||||||
CLAY(lId, {
|
.layout = {
|
||||||
|
.sizing = {.width = CLAY_SIZING_FIT(0), .height = CLAY_SIZING_FIT(0) },
|
||||||
|
.childGap = io.theme->childGap1,
|
||||||
|
.childAlignment = { .x = CLAY_ALIGN_X_LEFT, .y = CLAY_ALIGN_Y_BOTTOM},
|
||||||
|
.layoutDirection = CLAY_TOP_TO_BOTTOM
|
||||||
|
}
|
||||||
|
}) {
|
||||||
|
CLAY_AUTO_ID({
|
||||||
.layout = {
|
.layout = {
|
||||||
.sizing = {.width = CLAY_SIZING_FIT(0), .height = CLAY_SIZING_FIT(0) },
|
.sizing = {.width = CLAY_SIZING_GROW(0), .height = CLAY_SIZING_FIT(0) },
|
||||||
},
|
.childAlignment = { .x = CLAY_ALIGN_X_LEFT, .y = CLAY_ALIGN_Y_BOTTOM},
|
||||||
.backgroundColor = convert_vec4<Clay_Color>(io.theme->backColor1),
|
.layoutDirection = CLAY_LEFT_TO_RIGHT
|
||||||
.cornerRadius = CLAY_CORNER_RADIUS(io.theme->windowCorners1)
|
}
|
||||||
}) {
|
}) {
|
||||||
gui.clipping_element<ScrollArea>("tools scroll", ScrollArea::Options{
|
CLAY_AUTO_ID({
|
||||||
.scrollHorizontal = true,
|
.layout = {
|
||||||
.clipHorizontal = true,
|
.sizing = {.width = CLAY_SIZING_GROW(0), .height = CLAY_SIZING_FIT(0) },
|
||||||
.scrollbarX = ScrollArea::ScrollbarType::NONE,
|
}
|
||||||
.layoutDirection = CLAY_LEFT_TO_RIGHT,
|
}) {}
|
||||||
.xAlign = CLAY_ALIGN_X_LEFT,
|
switch(settingsMenuPopup) {
|
||||||
.yAlign = CLAY_ALIGN_Y_CENTER,
|
case SettingsMenuPopup::NONE:
|
||||||
.innerContent = [&](auto&) {
|
break;
|
||||||
drawProg.phone_bottom_toolbar_gui(*this);
|
case SettingsMenuPopup::SETTINGS:
|
||||||
|
tool_settings_popup();
|
||||||
|
break;
|
||||||
|
case SettingsMenuPopup::FG_COLOR:
|
||||||
|
break;
|
||||||
|
case SettingsMenuPopup::BG_COLOR:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
CLAY_AUTO_ID({
|
||||||
|
.layout = {
|
||||||
|
.sizing = {.width = CLAY_SIZING_GROW(0), .height = CLAY_SIZING_FIT(0) },
|
||||||
|
.childGap = io.theme->childGap1,
|
||||||
|
.childAlignment = { .x = CLAY_ALIGN_X_CENTER, .y = CLAY_ALIGN_Y_CENTER},
|
||||||
|
.layoutDirection = CLAY_LEFT_TO_RIGHT
|
||||||
|
}
|
||||||
|
}) {
|
||||||
|
gui.element<LayoutElement>("bottom toolbar", [&](LayoutElement*, const Clay_ElementId& lId) {
|
||||||
|
CLAY(lId, {
|
||||||
|
.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&) {
|
||||||
|
bottom_toolbar_gui();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
});
|
||||||
|
gui.element<LayoutElement>("bottom extra toolbar", [&](LayoutElement*, const Clay_ElementId& lId) {
|
||||||
|
CLAY(lId, {
|
||||||
|
.layout = {
|
||||||
|
.sizing = {.width = CLAY_SIZING_FIT(0), .height = CLAY_SIZING_FIT(0)},
|
||||||
|
.layoutDirection = CLAY_LEFT_TO_RIGHT
|
||||||
|
},
|
||||||
|
.backgroundColor = convert_vec4<Clay_Color>(io.theme->backColor1),
|
||||||
|
.cornerRadius = CLAY_CORNER_RADIUS(io.theme->windowCorners1)
|
||||||
|
}) {
|
||||||
|
bottom_extra_toolbar_gui();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
void PhoneDrawingProgramScreen::bottom_toolbar_gui() {
|
||||||
|
GUIManager& gui = main.g.gui;
|
||||||
|
auto& drawP = main.world->drawProg;
|
||||||
|
|
||||||
|
auto tool_button = [&](const char* id, const std::string& svgPath, DrawingProgramToolType toolType) {
|
||||||
|
svg_icon_button(gui, id, svgPath, {
|
||||||
|
.drawType = SelectableButton::DrawType::TRANSPARENT_ALL,
|
||||||
|
.isSelected = drawP.drawTool->get_type() == toolType,
|
||||||
|
.onClick = [&, toolType] {
|
||||||
|
drawP.switch_to_tool(toolType);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
tool_button("Brush Toolbar Button", "data/icons/brush.svg", DrawingProgramToolType::BRUSH);
|
||||||
|
tool_button("Eraser Toolbar Button", "data/icons/eraser.svg", DrawingProgramToolType::ERASER);
|
||||||
|
tool_button("Line Toolbar Button", "data/icons/line.svg", DrawingProgramToolType::LINE);
|
||||||
|
tool_button("Text Toolbar Button", "data/icons/text.svg", DrawingProgramToolType::TEXTBOX);
|
||||||
|
tool_button("Ellipse Toolbar Button", "data/icons/circle.svg", DrawingProgramToolType::ELLIPSE);
|
||||||
|
tool_button("Rect Toolbar Button", "data/icons/rectangle.svg", DrawingProgramToolType::RECTANGLE);
|
||||||
|
tool_button("RectSelect Toolbar Button", "data/icons/rectselect.svg", DrawingProgramToolType::RECTSELECT);
|
||||||
|
tool_button("LassoSelect Toolbar Button", "data/icons/lassoselect.svg", DrawingProgramToolType::LASSOSELECT);
|
||||||
|
tool_button("Edit Toolbar Button", "data/icons/cursor.svg", DrawingProgramToolType::EDIT);
|
||||||
|
tool_button("Eyedropper Toolbar Button", "data/icons/eyedropper.svg", DrawingProgramToolType::EYEDROPPER);
|
||||||
|
tool_button("Zoom Canvas Toolbar Button", "data/icons/zoom.svg", DrawingProgramToolType::ZOOM);
|
||||||
|
tool_button("Pan Canvas Toolbar Button", "data/icons/hand.svg", DrawingProgramToolType::PAN);
|
||||||
|
}
|
||||||
|
|
||||||
|
void PhoneDrawingProgramScreen::tool_settings_popup() {
|
||||||
|
GUIManager& gui = main.g.gui;
|
||||||
|
auto& drawP = main.world->drawProg;
|
||||||
|
auto& io = gui.io;
|
||||||
|
|
||||||
|
gui.element<LayoutElement>("tool settings popup", [&] (LayoutElement*, const Clay_ElementId& lId) {
|
||||||
|
CLAY(lId, {
|
||||||
|
.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.element<ScrollArea>("toolbox scroll area", ScrollArea::Options{
|
||||||
|
.scrollVertical = true,
|
||||||
|
.clipVertical = true,
|
||||||
|
.scrollbarY = ScrollArea::ScrollbarType::NORMAL,
|
||||||
|
.innerContent = [&](auto&) {
|
||||||
|
CLAY_AUTO_ID({
|
||||||
|
.layout = {
|
||||||
|
.sizing = {.width = CLAY_SIZING_GROW(0), .height = CLAY_SIZING_GROW(0)},
|
||||||
|
.padding = CLAY_PADDING_ALL(io.theme->padding1),
|
||||||
|
.childGap = io.theme->childGap1,
|
||||||
|
.layoutDirection = CLAY_TOP_TO_BOTTOM
|
||||||
|
},
|
||||||
|
}) {
|
||||||
|
drawP.drawTool->gui_phone_toolbox(*this);
|
||||||
|
}
|
||||||
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void PhoneDrawingProgramScreen::bottom_extra_toolbar_gui() {
|
||||||
|
GUIManager& gui = main.g.gui;
|
||||||
|
|
||||||
|
svg_icon_button(gui, "tool settings", "data/icons/RemixIcon/settings-3-line.svg", {
|
||||||
|
.drawType = SelectableButton::DrawType::TRANSPARENT_ALL,
|
||||||
|
.isSelected = settingsMenuPopup == SettingsMenuPopup::SETTINGS,
|
||||||
|
.onClick = [&] {
|
||||||
|
settingsMenuPopup = (settingsMenuPopup == SettingsMenuPopup::SETTINGS) ? SettingsMenuPopup::NONE : SettingsMenuPopup::SETTINGS;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
color_button(gui, "foreground color", &main.toolConfig.globalConf.foregroundColor, {
|
||||||
|
.drawType = SelectableButton::DrawType::TRANSPARENT_ALL,
|
||||||
|
.isSelected = settingsMenuPopup == SettingsMenuPopup::FG_COLOR,
|
||||||
|
.hasAlpha = true,
|
||||||
|
.onClick = [&] {
|
||||||
|
settingsMenuPopup = (settingsMenuPopup == SettingsMenuPopup::FG_COLOR) ? SettingsMenuPopup::NONE : SettingsMenuPopup::FG_COLOR;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
color_button(gui, "background color", &main.toolConfig.globalConf.backgroundColor, {
|
||||||
|
.drawType = SelectableButton::DrawType::TRANSPARENT_ALL,
|
||||||
|
.isSelected = settingsMenuPopup == SettingsMenuPopup::BG_COLOR,
|
||||||
|
.hasAlpha = true,
|
||||||
|
.onClick = [&] {
|
||||||
|
settingsMenuPopup = (settingsMenuPopup == SettingsMenuPopup::BG_COLOR) ? SettingsMenuPopup::NONE : SettingsMenuPopup::BG_COLOR;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
void PhoneDrawingProgramScreen::input_global_back_button_callback() {
|
void PhoneDrawingProgramScreen::input_global_back_button_callback() {
|
||||||
main.world->save_to_file(main.world->filePath);
|
main.world->save_to_file(main.world->filePath);
|
||||||
main.set_tab_to_close(main.world.get());
|
main.set_tab_to_close(main.world.get());
|
||||||
|
|
|
||||||
|
|
@ -10,8 +10,17 @@ class PhoneDrawingProgramScreen : public DrawingProgramScreen {
|
||||||
virtual void input_global_back_button_callback() override;
|
virtual void input_global_back_button_callback() override;
|
||||||
virtual void input_app_about_to_go_to_background_callback() override;
|
virtual void input_app_about_to_go_to_background_callback() override;
|
||||||
private:
|
private:
|
||||||
|
void bottom_toolbar_gui();
|
||||||
|
void bottom_extra_toolbar_gui();
|
||||||
void save_files();
|
void save_files();
|
||||||
void top_toolbar();
|
void top_toolbar();
|
||||||
void bottom_toolbar();
|
void bottom_toolbar();
|
||||||
void main_display();
|
void main_display();
|
||||||
|
void tool_settings_popup();
|
||||||
|
enum class SettingsMenuPopup {
|
||||||
|
NONE,
|
||||||
|
SETTINGS,
|
||||||
|
FG_COLOR,
|
||||||
|
BG_COLOR
|
||||||
|
} settingsMenuPopup = SettingsMenuPopup::NONE;
|
||||||
};
|
};
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue