diff --git a/data/layout.xml b/data/layout.xml index e460ddc..19ecb3d 100644 --- a/data/layout.xml +++ b/data/layout.xml @@ -687,7 +687,18 @@ Roboto Font License: - + + + - + @@ -928,6 +939,10 @@ Here's a list of what's available in this release. + + + + @@ -964,10 +979,12 @@ Here's a list of what's available in this release. + diff --git a/src/app_events.cpp b/src/app_events.cpp index d464b89..16b6b7b 100644 --- a/src/app_events.cpp +++ b/src/app_events.cpp @@ -15,7 +15,9 @@ void App::crash_test() [ios_view crash]; #elif __OSX__ [osx_view hockeyapp_crash]; -#elif __ANDROID__ +#elif defined(_WIN32) + __debugbreak(); +#elif defined(__ANDROID__) #endif } diff --git a/src/app_layout.cpp b/src/app_layout.cpp index eae794a..4d245a4 100644 --- a/src/app_layout.cpp +++ b/src/app_layout.cpp @@ -642,8 +642,16 @@ void App::init_menu_layer() popup->destroy(); }; + popup->find("camera-reset")->on_click = [this](Node*) { + canvas->reset_camera(); + popup->mouse_release(); + popup->destroy(); + }; + popup->find("layer-clear")->on_click = [this](Node*) { canvas->m_canvas->clear(); + popup->mouse_release(); + popup->destroy(); }; if (layers->m_current_layer) popup->find("layer-clear")-> diff --git a/src/canvas.cpp b/src/canvas.cpp index e05bd96..ce4398a 100644 --- a/src/canvas.cpp +++ b/src/canvas.cpp @@ -2184,10 +2184,6 @@ void Canvas::set_camera(const CameraData& c) m_vp = c.m_vp; } -void Canvas::reset_camera() -{ -} - std::vector Canvas::triangulate_simple(const std::vector& vertices) { std::vector ret; diff --git a/src/canvas.h b/src/canvas.h index cb12c43..5041e64 100644 --- a/src/canvas.h +++ b/src/canvas.h @@ -245,7 +245,6 @@ public: void pop_camera(); CameraData get_camera(); void set_camera(const CameraData& c); - void reset_camera(); }; class ActionStroke : public Action