gabm · RobertMueller2 · Jul 30, 2025 · Jul 30, 2025 · Jul 30, 2025
diff --git a/README.md b/README.md
@@ -78,6 +78,8 @@ save-after-copy = false
 default-hide-toolbars = false
 # Experimental: whether window focus shows/hides toolbars. This does not affect initial state of toolbars, see default-hide-toolbars.
 focus-toggles-toolbars = false
+# Fill shapes by default
+default-fill-shapes = false
 # The primary highlighter to use, the other is accessible by holding CTRL at the start of a highlight [possible values: block, freehand]
 primary-highlighter = "block"
 # Disable notifications
@@ -170,6 +172,8 @@ Options:
           Hide toolbars by default
       --focus-toggles-toolbars
           Experimental: Whether to toggle toolbars based on focus. Doesn't affect initial state
+      --default-fill-shapes
+          Fill shapes by default
       --font-family <FONT_FAMILY>
           Font family to use for text annotations
       --font-style <FONT_STYLE>

diff --git a/src/command_line.rs b/src/command_line.rs
@@ -66,6 +66,10 @@ pub struct CommandLine {
     #[arg(long)]
     pub focus_toggles_toolbars: bool,
 
+    /// Fill shapes by default
+    #[arg(long)]
+    pub default_fill_shapes: bool,
+
     /// Font family to use for text annotations
     #[arg(long)]
     pub font_family: Option<String>,

diff --git a/src/configuration.rs b/src/configuration.rs
@@ -47,6 +47,7 @@ pub struct Configuration {
     color_palette: ColorPalette,
     default_hide_toolbars: bool,
     focus_toggles_toolbars: bool,
+    default_fill_shapes: bool,
     font: FontConfiguration,
     primary_highlighter: Highlighters,
     disable_notifications: bool,
@@ -189,6 +190,9 @@ impl Configuration {
         if let Some(v) = general.focus_toggles_toolbars {
             self.focus_toggles_toolbars = v;
         }
+        if let Some(v) = general.default_fill_shapes {
+            self.default_fill_shapes = v;
+        }
         if let Some(v) = general.primary_highlighter {
             self.primary_highlighter = v;
         }
@@ -250,6 +254,9 @@ impl Configuration {
         if command_line.focus_toggles_toolbars {
             self.focus_toggles_toolbars = command_line.focus_toggles_toolbars
         }
+        if command_line.default_fill_shapes {
+            self.default_fill_shapes = command_line.default_fill_shapes;
+        }
         if let Some(v) = command_line.initial_tool {
             self.initial_tool = v.into();
         }
@@ -371,6 +378,10 @@ impl Configuration {
         self.focus_toggles_toolbars
     }
 
+    pub fn default_fill_shapes(&self) -> bool {
+        self.default_fill_shapes
+    }
+
     pub fn primary_highlighter(&self) -> Highlighters {
         self.primary_highlighter
     }
@@ -414,6 +425,7 @@ impl Default for Configuration {
             color_palette: ColorPalette::default(),
             default_hide_toolbars: false,
             focus_toggles_toolbars: false,
+            default_fill_shapes: false,
             font: FontConfiguration::default(),
             primary_highlighter: Highlighters::Block,
             disable_notifications: false,
@@ -470,6 +482,7 @@ struct ConfigurationFileGeneral {
     actions_on_right_click: Option<Vec<Action>>,
     default_hide_toolbars: Option<bool>,
     focus_toggles_toolbars: Option<bool>,
+    default_fill_shapes: Option<bool>,
     primary_highlighter: Option<Highlighters>,
     disable_notifications: Option<bool>,
     no_window_decoration: Option<bool>,

diff --git a/src/style.rs b/src/style.rs
@@ -40,7 +40,7 @@ impl Default for Style {
         Self {
             color: Color::default(),
             size: Size::default(),
-            fill: bool::default(),
+            fill: APP_CONFIG.read().default_fill_shapes(),
             annotation_size_factor: APP_CONFIG.read().annotation_size_factor(),
         }
     }

diff --git a/src/ui/toolbars.rs b/src/ui/toolbars.rs
@@ -461,7 +461,11 @@ impl Component for StyleToolbar {
                 set_focusable: false,
                 set_hexpand: false,
 
-                set_icon_name: "paint-bucket-regular",
+                set_icon_name: if APP_CONFIG.read().default_fill_shapes() {
+                    "paint-bucket-filled"
+                } else {
+                    "paint-bucket-regular"
+                },
                 set_tooltip: "Fill shape",
                 connect_clicked[sender] => move |button| {
                     sender.output_sender().emit(ToolbarEvent::ToggleFill);