Add shadow margin support to gtk client side input panel

fcitx/fcitx5#474
fcitx · Apr 8, 2022 · 8881d7a · 8881d7a
1 parent 67faf18
commit 8881d7a
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 0 deletions.
diff --git a/gtk3/fcitxtheme.cpp b/gtk3/fcitxtheme.cpp
@@ -743,6 +743,7 @@ void InputPanelThemeConfig::load(GKeyFile *file) {
     prev.load(file, "InputPanel/PrevPage");
     next.load(file, "InputPanel/NextPage");
     blurMargin.load(file, "InputPanel/BlurMargin");
+    shadowMargin.load(file, "InputPanel/ShadowMargin");
 }
 
 void MarginConfig::load(GKeyFile *file, const char *group) {

diff --git a/gtk3/fcitxtheme.h b/gtk3/fcitxtheme.h
@@ -79,6 +79,7 @@ struct InputPanelThemeConfig {
     ActionImageConfig prev;
     ActionImageConfig next;
     MarginConfig blurMargin;
+    MarginConfig shadowMargin;
 };
 
 class ThemeImage {

diff --git a/gtk3/gtk3inputwindow.cpp b/gtk3/gtk3inputwindow.cpp
@@ -5,6 +5,7 @@
  *
  */
 #include "gtk3inputwindow.h"
+#include "fcitxtheme.h"
 #include <gtk/gtk.h>
 
 namespace fcitx::gtk {
@@ -88,6 +89,14 @@ void Gtk3InputWindow::update() {
         pango_cairo_context_set_resolution(context_.get(), dpi_);
         std::tie(width_, height_) = sizeHint();
 
+        if (auto gdkWindow = gtk_widget_get_window(window_.get())) {
+            gdk_window_set_shadow_width(
+                gdkWindow, config_->theme_.shadowMargin.marginLeft,
+                config_->theme_.shadowMargin.marginRight,
+                config_->theme_.shadowMargin.marginTop,
+                config_->theme_.shadowMargin.marginBottom);
+        }
+
         gtk_widget_realize(window_.get());
         gtk_window_resize(GTK_WINDOW(window_.get()), width_, height_);
         gtk_widget_queue_draw(window_.get());

diff --git a/gtk4/gtk4inputwindow.cpp b/gtk4/gtk4inputwindow.cpp
@@ -6,6 +6,7 @@
  */
 #include "gtk4inputwindow.h"
 #include <gtk/gtk.h>
+#include <gtk3/fcitxtheme.h>
 
 namespace fcitx::gtk {
 
@@ -143,6 +144,12 @@ void Gtk4InputWindow::reposition() {
     gdk_popup_layout_set_anchor_hints(
         popupLayout,
         static_cast<GdkAnchorHints>(GDK_ANCHOR_SLIDE_X | GDK_ANCHOR_FLIP_Y));
+
+    gdk_popup_layout_set_shadow_width(
+        popupLayout, config_->theme_.shadowMargin.marginLeft,
+        config_->theme_.shadowMargin.marginRight,
+        config_->theme_.shadowMargin.marginTop,
+        config_->theme_.shadowMargin.marginBottom);
     gdk_popup_present(GDK_POPUP(window_.get()), width_, height_, popupLayout);
     gdk_popup_layout_unref(popupLayout);
 }