add reset camera menu, update changelog, remove crash test menu

This commit is contained in:
2018-11-30 15:27:24 +01:00
parent 829e8c0b62
commit 9f41831b71
5 changed files with 30 additions and 8 deletions

View File

@@ -687,7 +687,18 @@ Roboto Font License:
<!--window content--> <!--window content-->
<border color=".2" width="100%" height="400"> <border color=".2" width="100%" height="400">
<scroll pad="10" margin="5" color=".3 .3 .3 .4" dir="col" shrink="1"> <scroll pad="10" margin="5" color=".3 .3 .3 .4" dir="col" shrink="1">
<text margin="0 0 0 5" font-face="arial" font-size="30" text="0.1.4"/> <text margin="0 0 0 5" font-face="arial" font-size="30" text="0.1.6"/>
<text margin="10 0 0 5" font-face="arial" font-size="11" text=
"- [FIX] Set system message box on top when recovery
- [FIX] Skip Apple Pencil first samples to overcome the initial pressure spike
- [WIN] Add initial VR support with openvr
- [FIX] Layer delete order bug
- [FIX] Improve brush preview during the stroke
- Add import flat images
- Add copy/cut and transform selection
- Add camera reset menu in Layers
"/>
<text margin="20 0 0 5" font-face="arial" font-size="30" text="0.1.4"/>
<text margin="10 0 0 5" font-face="arial" font-size="11" text= <text margin="10 0 0 5" font-face="arial" font-size="11" text=
"- [WIN] Add: Windows Store package installer "- [WIN] Add: Windows Store package installer
- [OSX] Quick Look plugin for thumbnail generation - [OSX] Quick Look plugin for thumbnail generation
@@ -862,7 +873,7 @@ Here's a list of what's available in this release.
<icon icon="picture_go" width="20"/> <icon icon="picture_go" width="20"/>
<text text="Export JPG" grow="1" margin="0 0 0 5" font-face="arial" font-size="11"/> <text text="Export JPG" grow="1" margin="0 0 0 5" font-face="arial" font-size="11"/>
</button-custom> </button-custom>
<button-custom id="file-share" os="osx,ios" text="Menu" height="40" align="center" color=".2" pad="0 0 0 10" dir="row"> <button-custom id="file-share" os="osx" text="Menu" height="40" align="center" color=".2" pad="0 0 0 10" dir="row">
<icon icon="picture_go" width="20"/> <icon icon="picture_go" width="20"/>
<text text="Share" grow="1" margin="0 0 0 5" font-face="arial" font-size="11"/> <text text="Share" grow="1" margin="0 0 0 5" font-face="arial" font-size="11"/>
</button-custom> </button-custom>
@@ -928,6 +939,10 @@ Here's a list of what's available in this release.
<icon icon="application_edit" width="20"/> <icon icon="application_edit" width="20"/>
<text id="menu-label" text="Merge with" margin="0 0 0 5" font-face="arial" font-size="11"/> <text id="menu-label" text="Merge with" margin="0 0 0 5" font-face="arial" font-size="11"/>
</button-custom> </button-custom>
<button-custom id="camera-reset" height="40" align="center" color=".2" pad="0 0 0 10" dir="row">
<icon icon="arrow_rotate_clockwise" width="20"/>
<text id="menu-label" text="Reset Camera" margin="0 0 0 5" font-face="arial" font-size="11"/>
</button-custom>
</popup-menu> </popup-menu>
</layout> </layout>
@@ -964,10 +979,12 @@ Here's a list of what's available in this release.
<icon icon="bug" width="20"/> <icon icon="bug" width="20"/>
<text id="menu-label" text="What's new?" margin="0 0 0 5" font-face="arial" font-size="11"/> <text id="menu-label" text="What's new?" margin="0 0 0 5" font-face="arial" font-size="11"/>
</button-custom> </button-custom>
<!--
<button-custom id="about-crash" height="40" align="center" color=".2" pad="0 0 0 10" dir="row"> <button-custom id="about-crash" height="40" align="center" color=".2" pad="0 0 0 10" dir="row">
<icon icon="bug" width="20"/> <icon icon="bug" width="20"/>
<text id="menu-label" text="Induce crash" margin="0 0 0 5" font-face="arial" font-size="11"/> <text id="menu-label" text="Induce crash" margin="0 0 0 5" font-face="arial" font-size="11"/>
</button-custom> </button-custom>
-->
</popup-menu> </popup-menu>
</layout> </layout>

View File

@@ -15,7 +15,9 @@ void App::crash_test()
[ios_view crash]; [ios_view crash];
#elif __OSX__ #elif __OSX__
[osx_view hockeyapp_crash]; [osx_view hockeyapp_crash];
#elif __ANDROID__ #elif defined(_WIN32)
__debugbreak();
#elif defined(__ANDROID__)
#endif #endif
} }

View File

@@ -642,8 +642,16 @@ void App::init_menu_layer()
popup->destroy(); popup->destroy();
}; };
popup->find<NodeButtonCustom>("camera-reset")->on_click = [this](Node*) {
canvas->reset_camera();
popup->mouse_release();
popup->destroy();
};
popup->find<NodeButtonCustom>("layer-clear")->on_click = [this](Node*) { popup->find<NodeButtonCustom>("layer-clear")->on_click = [this](Node*) {
canvas->m_canvas->clear(); canvas->m_canvas->clear();
popup->mouse_release();
popup->destroy();
}; };
if (layers->m_current_layer) if (layers->m_current_layer)
popup->find<NodeButtonCustom>("layer-clear")-> popup->find<NodeButtonCustom>("layer-clear")->

View File

@@ -2184,10 +2184,6 @@ void Canvas::set_camera(const CameraData& c)
m_vp = c.m_vp; m_vp = c.m_vp;
} }
void Canvas::reset_camera()
{
}
std::vector<vertex_t> Canvas::triangulate_simple(const std::vector<vertex_t>& vertices) std::vector<vertex_t> Canvas::triangulate_simple(const std::vector<vertex_t>& vertices)
{ {
std::vector<vertex_t> ret; std::vector<vertex_t> ret;

View File

@@ -245,7 +245,6 @@ public:
void pop_camera(); void pop_camera();
CameraData get_camera(); CameraData get_camera();
void set_camera(const CameraData& c); void set_camera(const CameraData& c);
void reset_camera();
}; };
class ActionStroke : public Action class ActionStroke : public Action