From 8512585a41956eebe621ead7be3613a90d53149c Mon Sep 17 00:00:00 2001
From: wwmayer <wmayer@freecad.org>
Date: Wed, 27 Aug 2025 16:01:54 +0200
Subject: [PATCH] Measure: Fix quick measure command

* Clear status bar when switching off quick measure
* Activate quick measure by default
* Remove command from toolbar as there is currently no icon
---
 src/Gui/Workbench.cpp              | 2 +-
 src/Mod/Measure/Gui/Command.cpp    | 5 ++++-
 src/Mod/Measure/Gui/QuickMeasure.h | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/Gui/Workbench.cpp b/src/Gui/Workbench.cpp
index c6eefc3ddf..bf44bf0523 100644
--- a/src/Gui/Workbench.cpp
+++ b/src/Gui/Workbench.cpp
@@ -813,7 +813,7 @@ ToolBarItem* StdWorkbench::setupToolBars() const
     auto view = new ToolBarItem( root );
     view->setCommand("View");
     *view << "Std_ViewFitAll" << "Std_ViewFitSelection" << "Std_ViewGroup" << "Std_AlignToSelection"
-          << "Separator" << "Std_DrawStyle" << "Std_TreeViewActions" << "Std_Measure" << "Std_QuickMeasure";
+          << "Separator" << "Std_DrawStyle" << "Std_TreeViewActions" << "Std_Measure";
 
     // Individual views
     auto individualViews = new ToolBarItem(root, ToolBarItem::DefaultVisibility::Hidden);
diff --git a/src/Mod/Measure/Gui/Command.cpp b/src/Mod/Measure/Gui/Command.cpp
index 873059b9da..3cf5860b31 100644
--- a/src/Mod/Measure/Gui/Command.cpp
+++ b/src/Mod/Measure/Gui/Command.cpp
@@ -115,6 +115,9 @@ protected:
         }
 
         if (iMsg == 0) {
+            if (quickMeasure) {
+                quickMeasure->print(QString());
+            }
             quickMeasure.reset();
         }
         else {
@@ -125,7 +128,7 @@ protected:
     {
         Gui::Action* action = Gui::Command::createAction();
         action->setCheckable(true);
-        action->setChecked(parameter->GetBool("EnableQuickMeasure", false));
+        action->setChecked(parameter->GetBool("EnableQuickMeasure", true));
         return action;
     }
     void accessParameter()
diff --git a/src/Mod/Measure/Gui/QuickMeasure.h b/src/Mod/Measure/Gui/QuickMeasure.h
index 9970bf2ff7..855ee8d01a 100644
--- a/src/Mod/Measure/Gui/QuickMeasure.h
+++ b/src/Mod/Measure/Gui/QuickMeasure.h
@@ -47,6 +47,7 @@ class QuickMeasure: public QObject, Gui::SelectionObserver
 public:
     explicit QuickMeasure(QObject* parent = nullptr);
     ~QuickMeasure() override;
+    void print(const QString& message);
 
 private:
     void onSelectionChanged(const Gui::SelectionChanges& msg) override;
@@ -56,7 +57,6 @@ private:
     void addSelectionToMeasurement();
     bool isObjAcceptable(App::DocumentObject* obj);
     void printResult();
-    void print(const QString& message);
 
     void processSelection();