Changes related to text input on Android, general bug fixes, license change to GPLv3
This commit is contained in:
parent
8b3e321ab5
commit
fc8f414b67
308 changed files with 8707 additions and 440 deletions
|
|
@ -1,3 +1,21 @@
|
|||
/*
|
||||
* InfiniPaint
|
||||
* Copyright (C) 2025-2026 Yousef Khadadeh
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
#include "GUIStuff/Elements/ScrollArea.hpp"
|
||||
#include "DrawData.hpp"
|
||||
|
|
@ -36,6 +54,7 @@ class Toolbar {
|
|||
Toolbar(MainProgram& initMain);
|
||||
void update();
|
||||
void layout_run();
|
||||
|
||||
struct ColorSelectorData {
|
||||
std::function<void()> onChange;
|
||||
std::function<void()> onSelect;
|
||||
|
|
@ -47,6 +66,7 @@ class Toolbar {
|
|||
std::function<void()> onSelect;
|
||||
std::function<void()> onDeselect;
|
||||
};
|
||||
|
||||
void color_selector_left(GUIStuff::Element* button, Vector4f* color, const ColorSelectorData& colorSelectorData = {});
|
||||
void color_selector_right(GUIStuff::Element* button, Vector4f* color, const ColorSelectorData& colorSelectorData = {});
|
||||
void color_button_left(const char* id, Vector4f* color, const ColorSelectorButtonData& colorSelectorData = {});
|
||||
|
|
@ -62,14 +82,6 @@ class Toolbar {
|
|||
void open_chatbox();
|
||||
void close_chatbox();
|
||||
|
||||
GUIStuff::Element* colorLeftButton;
|
||||
Vector4f* colorLeft = nullptr;
|
||||
ColorSelectorData colorLeftData;
|
||||
|
||||
GUIStuff::Element* colorRightButton;
|
||||
Vector4f* colorRight = nullptr;
|
||||
ColorSelectorData colorRightData;
|
||||
|
||||
bool drawGui = true;
|
||||
|
||||
bool app_close_requested();
|
||||
|
|
@ -108,6 +120,14 @@ class Toolbar {
|
|||
void general_settings_inner_gui();
|
||||
void center_obstructing_window_gui(const char* id, Clay_SizingAxis x, Clay_SizingAxis y, const std::function<void()>& innerContent);
|
||||
|
||||
GUIStuff::Element* colorLeftButton;
|
||||
Vector4f* colorLeft = nullptr;
|
||||
ColorSelectorData colorLeftData;
|
||||
|
||||
GUIStuff::Element* colorRightButton;
|
||||
Vector4f* colorRight = nullptr;
|
||||
ColorSelectorData colorRightData;
|
||||
|
||||
struct ClosePopupData {
|
||||
struct CloseWorldData {
|
||||
std::weak_ptr<World> w;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue