move gtk_init; expose headers

fcitx-contrib · Jul 8, 2024 · aefd6df · aefd6df
1 parent 9e08cfb
commit aefd6df
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -22,7 +22,6 @@ if(LINUX)
 endif()
 
 include_directories(pugixml/src)
-include_directories(webview)
 
 if(NOT "${WKWEBVIEW_PROTOCOL}" STREQUAL "")
     add_definitions(-DWKWEBVIEW_PROTOCOL="${WKWEBVIEW_PROTOCOL}")

diff --git a/preview/preview.cpp b/preview/preview.cpp
@@ -13,8 +13,6 @@ int main(int argc, char *argv[]) {
 #ifdef __APPLE__
     @autoreleasepool {
         NSApplication *application = [NSApplication sharedApplication];
-#elif defined(__linux__)
-    gtk_init(&argc, &argv);
 #endif
         std::unique_ptr<candidate_window::CandidateWindow> candidateWindow =
             std::make_unique<candidate_window::WebviewCandidateWindow>();

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -11,7 +11,7 @@ endif()
 
 add_library(WebviewCandidateWindow ${SOURCES})
 
-target_include_directories(WebviewCandidateWindow PRIVATE "${PROJECT_SOURCE_DIR}/include")
+target_include_directories(WebviewCandidateWindow PUBLIC "${PROJECT_SOURCE_DIR}/include" "${PROJECT_SOURCE_DIR}/webview")
 
 if(APPLE)
     target_link_libraries(WebviewCandidateWindow "-framework WebKit" PkgConfig::NlohmannJson)

diff --git a/src/linux.cpp b/src/linux.cpp
@@ -4,6 +4,7 @@
 namespace candidate_window {
 
 void *WebviewCandidateWindow::create_window() {
+    gtk_init(nullptr, nullptr);
     auto window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
     gtk_window_set_default_size(GTK_WINDOW(window), 400, 300);
     gtk_window_set_decorated(GTK_WINDOW(window), FALSE);