juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-06-05 19:42:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

imgui: Refactor, use in cut gizmo

Browse Source
This commit is contained in:
Vojtech Kral
2018-11-26 10:56:07 +01:00
parent 763b443459
commit c29493a41b
15 changed files with 315 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/slic3r/GUI/GUI_App.hpp
View File

@@ -1,6 +1,7 @@
#ifndef slic3r_GUI_App_hpp_
#define slic3r_GUI_App_hpp_
#include <memory>
#include <string>
#include "PrintConfig.hpp"
#include "MainFrame.hpp"
@@ -86,15 +87,13 @@ class GUI_App : public wxApp
wxLocale* m_wxLocale{ nullptr };
#if ENABLE_IMGUI
ImGuiWrapper m_imgui;
std::unique_ptr<ImGuiWrapper> m_imgui;
#endif // ENABLE_IMGUI
public:
bool OnInit() override;
#if ENABLE_IMGUI
int OnExit() override;
#endif // ENABLE_IMGUI
GUI_App() : wxApp() {}
GUI_App();
unsigned get_colour_approx_luma(const wxColour &colour);
void init_label_colours();
@@ -162,7 +161,7 @@ public:
std::vector<Tab *> tabs_list;
#if ENABLE_IMGUI
ImGuiWrapper& get_imgui() { return m_imgui; }
ImGuiWrapper* imgui() { return m_imgui.get(); }
#endif // ENABLE_IMGUI
};