From 693e58f306f3ad6c2c1aeda6d38031584b1a0352 Mon Sep 17 00:00:00 2001
From: pacomod <pacome.odd@gmail.com>
Date: Thu, 25 Mar 2021 15:27:46 +0100
Subject: [PATCH 1/3] add dock_height and icon_height to dock options

---
 metadata/dock.xml          | 8 ++++++++
 src/dock/dock.cpp          | 3 ++-
 src/dock/toplevel-icon.cpp | 8 ++++++--
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/metadata/dock.xml b/metadata/dock.xml
index aa889234..a5a69efc 100644
--- a/metadata/dock.xml
+++ b/metadata/dock.xml
@@ -22,5 +22,13 @@
 			<_name>Bottom</_name>
 		</desc>
 	</option>
+	<option name="dock_height" type="int">
+		<_short>Dock height</_short>
+		<default>100</default>
+	</option>
+	<option name="icon_height" type="int">
+		<_short>Dock icons height</_short>
+		<default>72</default>
+	</option>
 	</plugin>
 </wf-shell>
diff --git a/src/dock/dock.cpp b/src/dock/dock.cpp
index 76c92398..46d9bb94 100644
--- a/src/dock/dock.cpp
+++ b/src/dock/dock.cpp
@@ -22,6 +22,7 @@ class WfDock::impl
     Gtk::HBox box;
 
     WfOption<std::string> css_path{"dock/css_path"};
+    WfOption<int> dock_height{"dock/dock_height"};
 
     public:
     impl(WayfireOutput *output)
@@ -30,7 +31,7 @@ class WfDock::impl
         window = std::unique_ptr<WayfireAutohidingWindow> (
             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();
 
diff --git a/src/dock/toplevel-icon.cpp b/src/dock/toplevel-icon.cpp
index ca66a77e..39cc6134 100644
--- a/src/dock/toplevel-icon.cpp
+++ b/src/dock/toplevel-icon.cpp
@@ -15,6 +15,7 @@
 #include <iostream>
 #include <sstream>
 #include <cassert>
+#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<int> icon_height{"dock/icon_height"};
 
     public:
     impl(zwlr_foreign_toplevel_handle_v1 *handle, wl_output *output)
@@ -89,8 +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());
 
     }
 

From 853fdc87d1ef84fcae0f1904777a84560c499be5 Mon Sep 17 00:00:00 2001
From: pacomod <pacome.odd@gmail.com>
Date: Thu, 25 Mar 2021 16:00:19 +0100
Subject: [PATCH 2/3] untabify

---
 src/dock/toplevel-icon.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/dock/toplevel-icon.cpp b/src/dock/toplevel-icon.cpp
index 39cc6134..2fa453f8 100644
--- a/src/dock/toplevel-icon.cpp
+++ b/src/dock/toplevel-icon.cpp
@@ -92,10 +92,9 @@ class WfToplevelIcon::impl
     {
         this->app_id = app_id;
         IconProvider::set_image_from_icon(image,
-					  app_id,
-					  icon_height,
-					  button.get_scale_factor());
-
+                                          app_id,
+                                          icon_height,
+                                          button.get_scale_factor());
     }
 
     void send_rectangle_hint()

From b142d6f70efdbf2889a9ea45b40c8c6b5590e3a7 Mon Sep 17 00:00:00 2001
From: pacomod <pacome.odd@gmail.com>
Date: Tue, 30 Mar 2021 12:30:44 +0200
Subject: [PATCH 3/3] add background_color to dock options

---
 metadata/dock.xml | 4 ++++
 src/dock/dock.cpp | 5 ++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/metadata/dock.xml b/metadata/dock.xml
index a5a69efc..90b4305c 100644
--- a/metadata/dock.xml
+++ b/metadata/dock.xml
@@ -30,5 +30,9 @@
 		<_short>Dock icons height</_short>
 		<default>72</default>
 	</option>
+	<option name="background_color" type="color">
+		<_short>Dock background color</_short>
+		<default>#222222AA</default>
+	</option>
 	</plugin>
 </wf-shell>
diff --git a/src/dock/dock.cpp b/src/dock/dock.cpp
index 46d9bb94..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 <wayfire/config/types.hpp>
 
 class WfDock::impl
 {
@@ -23,6 +24,7 @@ class WfDock::impl
 
     WfOption<std::string> css_path{"dock/css_path"};
     WfOption<int> dock_height{"dock/dock_height"};
+    WfOption<wf::color_t> background_color{"dock/background_color"};
 
     public:
     impl(WayfireOutput *output)
@@ -50,7 +52,8 @@ class WfDock::impl
                     screen, css, GTK_STYLE_PROVIDER_PRIORITY_USER);
             }
         }
-
+	window->override_background_color
+	    (Gdk::RGBA(wf::option_type::to_string<wf::color_t>(background_color)));
         window->show_all();
         _wl_surface = gdk_wayland_window_get_wl_surface(
             window->get_window()->gobj());