From ceb0447d03832d37d3cf38926e47dd1096576159 Mon Sep 17 00:00:00 2001 From: Kacper Donat Date: Sat, 13 Jul 2024 14:40:14 +0200 Subject: [PATCH] Gui: Reduce Transform Dragger size Fixes: #13853 --- src/Gui/ViewParams.h | 1 + src/Gui/ViewProviderDragger.cpp | 9 +++++---- src/Gui/ViewProviderLink.cpp | 4 ++-- src/Mod/Assembly/Gui/ViewProviderAssembly.cpp | 2 +- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/Gui/ViewParams.h b/src/Gui/ViewParams.h index 2d2087bd3a..5e7abc4a77 100644 --- a/src/Gui/ViewParams.h +++ b/src/Gui/ViewParams.h @@ -66,6 +66,7 @@ public: FC_VIEW_PARAM(AxisXColor,unsigned long,Unsigned,0xCC333300) \ FC_VIEW_PARAM(AxisYColor,unsigned long,Unsigned,0x33CC3300) \ FC_VIEW_PARAM(AxisZColor,unsigned long,Unsigned,0x3333CC00) \ + FC_VIEW_PARAM(DraggerScale,double,Float,0.03) \ #undef FC_VIEW_PARAM diff --git a/src/Gui/ViewProviderDragger.cpp b/src/Gui/ViewProviderDragger.cpp index 89b2ddb9cb..2e20b3f52c 100644 --- a/src/Gui/ViewProviderDragger.cpp +++ b/src/Gui/ViewProviderDragger.cpp @@ -124,12 +124,13 @@ bool ViewProviderDragger::setEdit(int ModNum) { Q_UNUSED(ModNum); - if(checkLink()) + if (checkLink()) { return true; + } App::DocumentObject *genericObject = this->getObject(); - if (genericObject->isDerivedFrom(App::GeoFeature::getClassTypeId())) - { + + if (genericObject->isDerivedFrom(App::GeoFeature::getClassTypeId())) { auto geoFeature = static_cast(genericObject); const Base::Placement &placement = geoFeature->Placement.getValue(); auto tempTransform = new SoTransform(); @@ -143,7 +144,7 @@ bool ViewProviderDragger::setEdit(int ModNum) Gui::ViewParams::instance()->getAxisYColor(), Gui::ViewParams::instance()->getAxisZColor() ); - csysDragger->draggerSize.setValue(0.05f); + csysDragger->draggerSize.setValue(ViewParams::instance()->getDraggerScale()); csysDragger->translation.setValue(tempTransform->translation.getValue()); csysDragger->rotation.setValue(tempTransform->rotation.getValue()); diff --git a/src/Gui/ViewProviderLink.cpp b/src/Gui/ViewProviderLink.cpp index c36441a41d..abacf012e4 100644 --- a/src/Gui/ViewProviderLink.cpp +++ b/src/Gui/ViewProviderLink.cpp @@ -2865,9 +2865,9 @@ void ViewProviderLink::setEditViewer(Gui::View3DInventorViewer* viewer, int ModN cube->depth = length; viewer->setupEditingRoot(group,&dragCtx->preTransform); - }else{ + } else { auto dragger = static_cast(pcDragger.get()); - dragger->draggerSize.setValue(0.05f); + dragger->draggerSize.setValue(ViewParams::instance()->getDraggerScale()); dragger->setUpAutoScale(viewer->getSoRenderManager()->getCamera()); viewer->setupEditingRoot(pcDragger,&dragCtx->preTransform); diff --git a/src/Mod/Assembly/Gui/ViewProviderAssembly.cpp b/src/Mod/Assembly/Gui/ViewProviderAssembly.cpp index 7eccc43944..b88da7a264 100644 --- a/src/Mod/Assembly/Gui/ViewProviderAssembly.cpp +++ b/src/Mod/Assembly/Gui/ViewProviderAssembly.cpp @@ -249,7 +249,7 @@ void ViewProviderAssembly::setDragger() asmDragger->setAxisColors(Gui::ViewParams::instance()->getAxisXColor(), Gui::ViewParams::instance()->getAxisYColor(), Gui::ViewParams::instance()->getAxisZColor()); - asmDragger->draggerSize.setValue(0.05f); + asmDragger->draggerSize.setValue(Gui::ViewParams::instance()->getDraggerScale()); asmDraggerSwitch = new SoSwitch(SO_SWITCH_NONE); asmDraggerSwitch->addChild(asmDragger);