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

Rollback android save onstop change for now

Browse source
This commit is contained in:
Yousef Khadadeh 2026-05-18 09:45:17 +03:00
parent 35d2a03406
commit c07871337c
14 changed files with 19 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Screens/FileSelectScreen.cpp
View file

@ -1224,7 +1224,7 @@ void FileSelectScreen::save_files() {
SDL_SaveFile(infoPath.string().c_str(), saveJson.c_str(), saveJson.size());
}
void FileSelectScreen::input_android_on_stop_callback() {
void FileSelectScreen::input_app_about_to_go_to_background_callback() {
save_files();
}

2
src/Screens/FileSelectScreen.hpp
View file

@ -31,7 +31,7 @@ class FileSelectScreen : public Screen {
virtual void input_paste_callback(const CustomEvents::PasteEvent& paste) override;
virtual void input_open_infinipaint_file_callback(const CustomEvents::OpenInfiniPaintFileEvent& openFile) override;
virtual void input_global_back_button_callback() override;
virtual void input_android_on_stop_callback() override;
virtual void input_app_about_to_go_to_background_callback() override;
struct TrashInfo {
struct TrashFile {

14
src/Screens/PhoneDrawingProgramScreen.cpp
View file

@ -443,7 +443,7 @@ void PhoneDrawingProgramScreen::top_toolbar() {
svg_icon_button(gui, "back exit button", "data/icons/RemixIcon/arrow-left-s-line.svg", {
.drawType = SelectableButton::DrawType::TRANSPARENT_ALL,
.onClick = [&] {
save_to_file(true);
save_to_file();
main.set_tab_to_close(main.world.get());
}
});
@ -1231,19 +1231,19 @@ void PhoneDrawingProgramScreen::input_global_back_button_callback() {
main.g.gui.set_to_layout();
}
else {
save_to_file(true);
save_to_file();
main.set_tab_to_close(main.world.get());
main.g.gui.set_to_layout();
}
}
void PhoneDrawingProgramScreen::save_to_file(bool saveThumbnail) {
void PhoneDrawingProgramScreen::save_to_file() {
if(!main.world->netClient)
main.world->save_to_file(main.world->filePath, saveThumbnail);
main.world->save_to_file(main.world->filePath);
}
void PhoneDrawingProgramScreen::input_android_on_stop_callback() {
save_to_file(false); // not saving thumbnail for now, since thumbnail requires GPU
void PhoneDrawingProgramScreen::input_app_about_to_go_to_background_callback() {
save_to_file();
}
void PhoneDrawingProgramScreen::on_tab_close() {
@ -1277,6 +1277,6 @@ void PhoneDrawingProgramScreen::color_selector_button(const char* id, Vector4f*
PhoneDrawingProgramScreen::~PhoneDrawingProgramScreen() {
#ifndef __ANDROID__
save_to_file(true);
save_to_file();
#endif
}

4
src/Screens/PhoneDrawingProgramScreen.hpp
View file

@ -28,7 +28,7 @@ class PhoneDrawingProgramScreen : public DrawingProgramScreen {
virtual void update() override;
virtual void gui_layout_run() override;
virtual void input_global_back_button_callback() override;
virtual void input_android_on_stop_callback() override;
virtual void input_app_about_to_go_to_background_callback() override;
virtual void on_tab_close() override;
struct ColorSelectorData {
std::function<void()> onChange;
@ -101,7 +101,7 @@ class PhoneDrawingProgramScreen : public DrawingProgramScreen {
void bottom_toolbar();
void main_display();
void tool_settings_popup();
void save_to_file(bool saveThumbnail);
void save_to_file();
std::string serverToConnectTo;
std::string serverLocalID;

2
src/Screens/Screen.cpp
View file

@ -82,7 +82,7 @@ void Screen::input_finger_touch_callback(const InputManager::FingerTouchCallback
void Screen::input_finger_motion_callback(const InputManager::FingerMotionCallbackArgs& motion) {}
void Screen::input_window_resize_callback(const InputManager::WindowResizeCallbackArgs& w) {}
void Screen::input_window_scale_callback(const InputManager::WindowScaleCallbackArgs& w) {}
void Screen::input_android_on_stop_callback() {}
void Screen::input_app_about_to_go_to_background_callback() {}
void Screen::on_tab_close() {}
float Screen::calculate_gui_scale() { return main.g.final_gui_scale_not_fit(); }
std::optional<InputManager::TextBoxStartInfo> Screen::get_text_box_start_info() { return std::nullopt; }

2
src/Screens/Screen.hpp
View file

@ -64,7 +64,7 @@ class Screen {
virtual void input_finger_motion_callback(const InputManager::FingerMotionCallbackArgs& motion);
virtual void input_window_resize_callback(const InputManager::WindowResizeCallbackArgs& w);
virtual void input_window_scale_callback(const InputManager::WindowScaleCallbackArgs& w);
virtual void input_android_on_stop_callback();
virtual void input_app_about_to_go_to_background_callback();
virtual float calculate_gui_scale();
virtual void on_tab_close();
virtual std::optional<InputManager::TextBoxStartInfo> get_text_box_start_info();