copilot/infinipaint
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions 1

Separate drawing program screen from desktop GUI code

Browse source
This commit is contained in:
Yousef Khadadeh 2026-04-26 09:54:58 +03:00
parent 3061c604c5
commit 7274a9396b
6 changed files with 79 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

1
CMakeLists.txt
View file

@ -56,6 +56,7 @@ set(sources "src/main.cpp"
"src/CustomEvents.cpp"
"src/Screens/Screen.cpp"
"src/Screens/DrawingProgramScreen.cpp"
"src/Screens/DesktopDrawingProgramScreen.cpp"
"src/Screens/FileSelectScreen.cpp"
"src/Bookmarks/BookmarkListItem.cpp"
"src/Bookmarks/BookmarkManager.cpp"

60
src/Screens/DesktopDrawingProgramScreen.cpp Normal file
View file

@ -0,0 +1,60 @@
#include "DesktopDrawingProgramScreen.hpp"
#include "../MainProgram.hpp"
#include "DrawingProgramScreen.hpp"
DesktopDrawingProgramScreen::DesktopDrawingProgramScreen(MainProgram& m):
DrawingProgramScreen(m),
toolbar(m)
{}
void DesktopDrawingProgramScreen::update() {
toolbar.update();
DrawingProgramScreen::update();
}
void DesktopDrawingProgramScreen::gui_layout_run() {
toolbar.layout_run();
}
bool DesktopDrawingProgramScreen::app_close_requested() {
return toolbar.app_close_requested();
}
void DesktopDrawingProgramScreen::input_key_callback(const InputManager::KeyCallbackArgs& key) {
switch(key.key) {
case InputManager::KEY_NOGUI: {
if(key.down && !key.repeat) {
toolbar.drawGui = !toolbar.drawGui;
main.g.gui.set_to_layout();
}
break;
}
case InputManager::KEY_SAVE: {
if(key.down && !key.repeat)
toolbar.save_func();
break;
}
case InputManager::KEY_SAVE_AS: {
if(key.down && !key.repeat)
toolbar.save_as_func();
break;
}
case InputManager::KEY_OPEN_CHAT: {
if(key.down && !key.repeat)
toolbar.open_chatbox();
break;
}
}
DrawingProgramScreen::input_key_callback(key);
}
void DesktopDrawingProgramScreen::input_text_key_callback(const InputManager::KeyCallbackArgs& key) {
switch(key.key) {
case InputManager::KEY_GENERIC_ESCAPE: {
if(key.down && !key.repeat)
toolbar.close_chatbox();
break;
}
}
DrawingProgramScreen::input_text_key_callback(key);
}

15
src/Screens/DesktopDrawingProgramScreen.hpp Normal file
View file

@ -0,0 +1,15 @@
#pragma once
#include "DrawingProgramScreen.hpp"
#include "../Toolbar.hpp"
class DesktopDrawingProgramScreen : public DrawingProgramScreen {
public:
DesktopDrawingProgramScreen(MainProgram& m);
virtual void update() override;
virtual void gui_layout_run() override;
virtual bool app_close_requested() override;
virtual void input_key_callback(const InputManager::KeyCallbackArgs& key) override;
virtual void input_text_key_callback(const InputManager::KeyCallbackArgs& key) override;
private:
Toolbar toolbar;
};

43
src/Screens/DrawingProgramScreen.cpp
View file

@ -2,12 +2,10 @@
#include "../MainProgram.hpp"
DrawingProgramScreen::DrawingProgramScreen(MainProgram& m):
Screen(m),
toolbar(m)
Screen(m)
{}
void DrawingProgramScreen::update() {
toolbar.update();
main.world->focus_update();
}
@ -15,14 +13,6 @@ void DrawingProgramScreen::draw(SkCanvas* canvas) {
main.draw_world(canvas, main.world, main.world->drawData);
}
void DrawingProgramScreen::gui_layout_run() {
toolbar.layout_run();
}
bool DrawingProgramScreen::app_close_requested() {
return toolbar.app_close_requested();
}
void DrawingProgramScreen::input_add_file_to_canvas_callback(const CustomEvents::AddFileToCanvasEvent& addFile) {
main.world->input_add_file_to_canvas_callback(addFile);
}
@ -54,41 +44,10 @@ void DrawingProgramScreen::input_drop_text_callback(const InputManager::DropCall
}
void DrawingProgramScreen::input_key_callback(const InputManager::KeyCallbackArgs& key) {
switch(key.key) {
case InputManager::KEY_NOGUI: {
if(key.down && !key.repeat) {
toolbar.drawGui = !toolbar.drawGui;
main.g.gui.set_to_layout();
}
break;
}
case InputManager::KEY_SAVE: {
if(key.down && !key.repeat)
toolbar.save_func();
break;
}
case InputManager::KEY_SAVE_AS: {
if(key.down && !key.repeat)
toolbar.save_as_func();
break;
}
case InputManager::KEY_OPEN_CHAT: {
if(key.down && !key.repeat)
toolbar.open_chatbox();
break;
}
}
main.world->input_key_callback(key);
}
void DrawingProgramScreen::input_text_key_callback(const InputManager::KeyCallbackArgs& key) {
switch(key.key) {
case InputManager::KEY_GENERIC_ESCAPE: {
if(key.down && !key.repeat)
toolbar.close_chatbox();
break;
}
}
main.world->input_text_key_callback(key);
}

5
src/Screens/DrawingProgramScreen.hpp
View file

@ -1,14 +1,11 @@
#pragma once
#include "Screen.hpp"
#include "../Toolbar.hpp"
class DrawingProgramScreen : public Screen {
public:
DrawingProgramScreen(MainProgram& m);
virtual void update() override;
virtual void draw(SkCanvas* canvas) override;
virtual void gui_layout_run() override;
virtual bool app_close_requested() override;
virtual void input_add_file_to_canvas_callback(const CustomEvents::AddFileToCanvasEvent& addFile) override;
virtual void input_open_infinipaint_file_callback(const CustomEvents::OpenInfiniPaintFileEvent& openFile) override;
virtual void input_paste_callback(const CustomEvents::PasteEvent& paste) override;
@ -30,6 +27,4 @@ class DrawingProgramScreen : public Screen {
virtual void input_finger_motion_callback(const InputManager::FingerMotionCallbackArgs& motion) override;
virtual void input_window_resize_callback(const InputManager::WindowResizeCallbackArgs& w) override;
virtual void input_window_scale_callback(const InputManager::WindowScaleCallbackArgs& w) override;
private:
Toolbar toolbar;
};

4
src/main.cpp
View file

@ -3,7 +3,7 @@
#include "Helpers/StringHelpers.hpp"
#include "Helpers/FileDownloader.hpp"
#include "Screens/FileSelectScreen.hpp"
#include "Screens/DrawingProgramScreen.hpp"
#include "Screens/DesktopDrawingProgramScreen.hpp"
#include "VersionConstants.hpp"
#include "include/gpu/GpuTypes.h"
#include <SDL3/SDL_filesystem.h>
@ -539,7 +539,7 @@ SDL_AppResult SDL_AppInit(void **appstate, int argc, char **argv) {
}
}
mS.m->screen = std::make_unique<FileSelectScreen>(*mS.m);
mS.m->screen = std::make_unique<DrawingProgramScreen>(*mS.m);
mS.m->update(); // Run update once to make sure that callbacks dont crash