refactor: annotation size factor editing into toolbar

README.md

@@ -69,6 +69,17 @@ Touchpad: <sup>NEXTRELEASE</sup>
 
 If out of range select custom color <sup>0.21.0</sup>
 
+#### Size Selection <sup>NEXTRELEASE</sup>
+
+In the bottom toolbar the size can be edited directly or by + and - buttons.
+Minimum is 0.1 and maximum to 99.99.
+
+The bindings are:
+- Mouse <kbd>left-button</kbd>, <kbd>wheel</kbd> and key <kbd>up</kbd>/<kbd>down</kbd> step size is 0.1
+- Holding <kbd>Shift</kbd> will switch to 0.01 step size
+- Mouse <kbd>middle-button</kbd> and <kbd>page up</kbd>/<kbd>page down</kbd> step size is 1.0
+- Mouse <kbd>right-button</kbd> jumps to minimum/maximum
+
 #### Tool Selection Shortcuts (configurable) <sup>0.20.0</sup>
 Default single-key shortcuts:
 - <kbd>p</kbd>: Pointer tool

src/sketch_board.rs

@@ -795,6 +795,10 @@ impl SketchBoard {
         sender: ComponentSender<Self>,
     ) -> ToolUpdateResult {
         match toolbar_event {
+            ToolbarEvent::FocusCanvas => {
+                self.renderer.grab_focus();
+                ToolUpdateResult::Unmodified
+            }
             ToolbarEvent::ToolSelected(tool) => {
                 // deactivate old tool and save drawable, if any
                 let old_tool = self.active_tool.clone();
@@ -867,7 +871,7 @@ impl SketchBoard {
                     .borrow_mut()
                     .handle_event(ToolEvent::StyleChanged(self.style))
             }
-            ToolbarEvent::AnnotationSizeChanged(value) => {
+            ToolbarEvent::AnnotationSizeFactorChanged(value) => {
                 self.style.annotation_size_factor = value;
                 self.active_tool
                     .borrow_mut()
@@ -1232,6 +1236,12 @@ impl Component for SketchBoard {
                         }
                     }
                 } else {
+                    if let InputEvent::Mouse(me) = &ie
+                        && matches!(me.type_, MouseEventType::Click | MouseEventType::BeginDrag)
+                    {
+                        self.renderer.grab_focus();
+                    }
+
                     ie.handle_event_mouse_input(&self.renderer);
                     let active_tool_result = self
                         .active_tool