eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-23 19:09:18 +02:00
Code Issues 123 Wiki Activity

Merge branch 'milek-dev' into gfx-work

Browse Source
This commit is contained in:
milek7
2018-07-18 13:51:11 +02:00
parent 61bbfe667b 16d0f6ab65
commit 78b23b80aa
85 changed files with 3834 additions and 8300 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
uilayer.h
View File

@@ -43,6 +43,7 @@ public:
set_background( std::string const &Filename = "" );
void
set_tooltip( std::string const &Tooltip ) { m_tooltip = Tooltip; }
void set_cursor(int const Mode);
std::deque<std::string> log;
@@ -67,9 +68,11 @@ private:
bool m_f8active = false;
bool m_f9active = false;
bool m_f10active = false;
bool m_f11active = false;
bool events_active = false;
bool log_active;
bool m_cursorvisible;
ImGuiIO *imgui_io;
// progress bar config. TODO: put these together into an object