omar/panopainter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

implement open file dialog for linux

Browse Source
This commit is contained in:
Omar
2019-10-04 10:00:50 +02:00
parent 4298652476
commit a1c0dcb007
3 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
linux/CMakeLists.txt
View File

@@ -27,6 +27,7 @@ add_executable(panopainter
../libs/poly2tri/poly2tri/sweep/sweep_context.cc
../libs/poly2tri/poly2tri/sweep/sweep.cc
../libs/fmt/src/format.cc
../libs/tinyfiledialogs/tinyfiledialogs.c
../src/pch.cpp
../src/util.cpp
../src/rtt.cpp
@@ -115,6 +116,7 @@ target_include_directories(panopainter PRIVATE
../libs/hash-library
../libs/fmt/include
../libs/glad/include
../libs/tinyfiledialogs
)
target_link_libraries(panopainter glfw curl GL dl X11 pthread)

9
linux/src/main.cpp
View File

@@ -70,13 +70,13 @@ int main(int argc, char** args)
return 1;
}
glfwSetCursorPosCallback(wnd, [](GLFWwindow* w, double x, double y){
glfwSetCursorPosCallback(wnd, [](GLFWwindow* wnd, double x, double y){
g_cursor_pos = glm::vec2(x, y);
app.ui_task_async([=]{
app.mouse_move(x, y, 1.f, kEventSource::Mouse, false);
});
});
glfwSetMouseButtonCallback(wnd, [](GLFWwindow* w, int button, int action, int mods){
glfwSetMouseButtonCallback(wnd, [](GLFWwindow* wnd, int button, int action, int mods){
app.ui_task_async([=]{
if (action == GLFW_PRESS)
app.mouse_down(button, g_cursor_pos.x, g_cursor_pos.y, 1.f, kEventSource::Mouse, false);
@@ -95,6 +95,11 @@ int main(int argc, char** args)
glfwSetWindowShouldClose(app.glfw_window, GLFW_FALSE);
});
});
glfwSetWindowRefreshCallback(wnd, [](GLFWwindow* wnd){
app.ui_task_async([=]{
app.redraw = true;
}, true);
});
glfwMakeContextCurrent(wnd);
if (!gladLoadGLLoader((GLADloadproc)glfwGetProcAddress))