diff --git a/metadata/dock.xml b/metadata/dock.xml index aa889234..90b4305c 100644 --- a/metadata/dock.xml +++ b/metadata/dock.xml @@ -22,5 +22,17 @@ <_name>Bottom + + + diff --git a/src/dock/dock.cpp b/src/dock/dock.cpp index 76c92398..2376ce11 100644 --- a/src/dock/dock.cpp +++ b/src/dock/dock.cpp @@ -12,6 +12,7 @@ #include "dock.hpp" #include "../util/gtk-utils.hpp" +#include class WfDock::impl { @@ -22,6 +23,8 @@ class WfDock::impl Gtk::HBox box; WfOption css_path{"dock/css_path"}; + WfOption dock_height{"dock/dock_height"}; + WfOption background_color{"dock/background_color"}; public: impl(WayfireOutput *output) @@ -30,7 +33,7 @@ class WfDock::impl window = std::unique_ptr ( new WayfireAutohidingWindow(output, "dock")); - window->set_size_request(100, 100); + window->set_size_request(dock_height, dock_height); gtk_layer_set_layer(window->gobj(), GTK_LAYER_SHELL_LAYER_TOP); window->increase_autohide(); @@ -49,7 +52,8 @@ class WfDock::impl screen, css, GTK_STYLE_PROVIDER_PRIORITY_USER); } } - + window->override_background_color + (Gdk::RGBA(wf::option_type::to_string(background_color))); window->show_all(); _wl_surface = gdk_wayland_window_get_wl_surface( window->get_window()->gobj()); diff --git a/src/dock/toplevel-icon.cpp b/src/dock/toplevel-icon.cpp index ca66a77e..2fa453f8 100644 --- a/src/dock/toplevel-icon.cpp +++ b/src/dock/toplevel-icon.cpp @@ -15,6 +15,7 @@ #include #include #include +#include "wf-option-wrap.hpp" namespace IconProvider { @@ -32,6 +33,7 @@ class WfToplevelIcon::impl Gtk::Button button; Gtk::Image image; std::string app_id; + WfOption icon_height{"dock/icon_height"}; public: impl(zwlr_foreign_toplevel_handle_v1 *handle, wl_output *output) @@ -89,9 +91,10 @@ class WfToplevelIcon::impl void set_app_id(std::string app_id) { this->app_id = app_id; - IconProvider::set_image_from_icon(image, app_id, - 72, button.get_scale_factor()); - + IconProvider::set_image_from_icon(image, + app_id, + icon_height, + button.get_scale_factor()); } void send_rectangle_hint()