add logo, shutdown LogRemote on exit
This commit is contained in:
BIN
data/ui/p-black.png
Normal file
BIN
data/ui/p-black.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 613 B |
@@ -567,6 +567,16 @@ void App::initLayout()
|
|||||||
if (auto* toolbar = layout[main_id]->find<Node>("toolbar"))
|
if (auto* toolbar = layout[main_id]->find<Node>("toolbar"))
|
||||||
toolbar->m_flood_events = true;
|
toolbar->m_flood_events = true;
|
||||||
|
|
||||||
|
NodeImage* n = new NodeImage;
|
||||||
|
n->m_path = "data/ui/p-black.png";
|
||||||
|
n->m_tex_id = const_hash("data/ui/p-black.png");
|
||||||
|
n->create();
|
||||||
|
n->SetPositioning(YGPositionTypeAbsolute);
|
||||||
|
//n->SetPosition(100, 100);
|
||||||
|
YGNodeStyleSetPosition(n->y_node, YGEdgeBottom, 10);
|
||||||
|
YGNodeStyleSetPosition(n->y_node, YGEdgeLeft, 10);
|
||||||
|
n->SetSize(40, 60);
|
||||||
|
layout[main_id]->add_child(n);
|
||||||
/*
|
/*
|
||||||
if (auto* slider = layout[main_id]->find<NodeSliderH>("frames-slider"))
|
if (auto* slider = layout[main_id]->find<NodeSliderH>("frames-slider"))
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -30,6 +30,15 @@ void LogRemote::start()
|
|||||||
LOG("NET thread loop exit");
|
LOG("NET thread loop exit");
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void LogRemote::stop()
|
||||||
|
{
|
||||||
|
m_running = false;
|
||||||
|
m_mq.UnlockGetters();
|
||||||
|
if (m_thread.joinable())
|
||||||
|
m_thread.join();
|
||||||
|
}
|
||||||
|
|
||||||
void LogRemote::net_init()
|
void LogRemote::net_init()
|
||||||
{
|
{
|
||||||
if (!(curl = curl_easy_init()))
|
if (!(curl = curl_easy_init()))
|
||||||
@@ -120,8 +129,5 @@ void LogRemote::log(const wchar_t* format, ...)
|
|||||||
}
|
}
|
||||||
LogRemote::~LogRemote()
|
LogRemote::~LogRemote()
|
||||||
{
|
{
|
||||||
m_running = false;
|
stop();
|
||||||
m_mq.UnlockGetters();
|
|
||||||
if (m_thread.joinable())
|
|
||||||
m_thread.join();
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -26,6 +26,7 @@ public:
|
|||||||
std::ofstream m_logfile;
|
std::ofstream m_logfile;
|
||||||
|
|
||||||
void start();
|
void start();
|
||||||
|
void stop();
|
||||||
void net_init();
|
void net_init();
|
||||||
std::string net_request(std::string cmd, std::string data = "");
|
std::string net_request(std::string cmd, std::string data = "");
|
||||||
void net_close();
|
void net_close();
|
||||||
|
|||||||
@@ -390,9 +390,9 @@ int main(int argc, char** argv)
|
|||||||
auto present = App::I.animate || App::I.redraw ?
|
auto present = App::I.animate || App::I.redraw ?
|
||||||
PeekMessage(&msg, 0, 0, 0, PM_REMOVE) : GetMessage(&msg, 0, 0, 0);
|
PeekMessage(&msg, 0, 0, 0, PM_REMOVE) : GetMessage(&msg, 0, 0, 0);
|
||||||
|
|
||||||
|
running = !(msg.message == WM_QUIT/* || gl.keys[VK_ESCAPE]*/);
|
||||||
if (present)
|
if (present)
|
||||||
{
|
{
|
||||||
running = !(msg.message == WM_QUIT/* || gl.keys[VK_ESCAPE]*/);
|
|
||||||
DispatchMessage(&msg);
|
DispatchMessage(&msg);
|
||||||
TranslateMessage(&msg);
|
TranslateMessage(&msg);
|
||||||
}
|
}
|
||||||
@@ -422,6 +422,7 @@ int main(int argc, char** argv)
|
|||||||
WacomTablet::I.terminate();
|
WacomTablet::I.terminate();
|
||||||
DestroyWindow(hWnd);
|
DestroyWindow(hWnd);
|
||||||
UnregisterClass(className, hInst);
|
UnregisterClass(className, hInst);
|
||||||
|
LogRemote::I.stop();
|
||||||
}
|
}
|
||||||
|
|
||||||
LRESULT CALLBACK WndProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp)
|
LRESULT CALLBACK WndProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp)
|
||||||
|
|||||||
BIN
icon.ico
BIN
icon.ico
Binary file not shown.
|
Before Width: | Height: | Size: 109 KiB After Width: | Height: | Size: 108 KiB |
Reference in New Issue
Block a user