add option to disable shift/control in scale/rotate & fix alpha's pr

Author: HJfod

changelog.md

@@ -1,7 +1,10 @@
 # BetterEdit 6
 
 ## v6.10.0-alpha.9
+ * <cg>MacOS support!</c>
+ * Add option to disable shift/control keys in <co>Scale</c> and <cj>Rotate</c> controls
  * Fix crash scaling objects pt. 2
+ * Fix build tabs sometimes disappearing
 
 ## v6.10.0-alpha.8
  * Add <cp>Playtest Pause/Resume</c> keybind

mod.json

@@ -150,6 +150,12 @@
 			"name": "New Color Menu",
 			"description": "Changes the object color selection menu to show more channels aswell as previews for colors and special colors"
 		},
+		"scale-rotate-input-modifier-keys": {
+			"type": "bool",
+			"default": true,
+			"name": "Enable Shift/Control on Scale Input",
+			"description": "When holding the <cp>Shift</c> key, toggles snapping in the <co>Scale</c> and <cj>Rotate</c> controls, and when holding <cp>Control</c> toggles absolute position"
+		},
 		"larger-color-menu": {
 			"type": "bool",
 			"default": {

src/features/ImprovedScaleAndRotate.cpp

@@ -264,6 +264,9 @@ class $modify(SnappableScaleControl, GJScaleControl) {
     }
 
     void updateShiftAndControl(float) {
+        if (!Mod::get()->getSettingValue<bool>("scale-rotate-input-modifier-keys")) {
+            return;
+        }
         handleLockModifierState<0>(CCKeyboardDispatcher::get()->getShiftKeyPressed(), this->getSnapLock());
 
         static bool stateOverwrittenViaModifier = false;
@@ -484,6 +487,9 @@ class $modify(InputRotationControl, GJRotationControl) {
     }
 
     void updateShiftAndControl(float) {
+        if (!Mod::get()->getSettingValue<bool>("scale-rotate-input-modifier-keys")) {
+            return;
+        }
         handleLockModifierState<1>(CCKeyboardDispatcher::get()->getShiftKeyPressed(), this->getSnapLock());
         handleLockModifierState<2>(CCKeyboardDispatcher::get()->getControlKeyPressed(), this->getPosLock());
     }

src/features/scaling/EditorUIScaling.cpp

@@ -23,20 +23,18 @@ class $modify(BetterEditButtonBar, EditButtonBar) {
 
     $override
     void loadFromItems(CCArray* items, int c, int r, bool persist) {
-
         EditButtonBar::loadFromItems(items, c, r, persist);
 
         // do not update if no change is made to prevent lag
         if (m_fields->m_cols == c && m_fields->m_rows == r && !persist) return;
 
         m_fields->m_cols = c;
         m_fields->m_rows = r;
-        updateUI(persist);
+        updateUI();
     }
 
-    void updateUI(bool persist) {
-        
-        EditButtonBar::loadFromItems(m_buttonArray, m_fields->m_cols, m_fields->m_rows, persist);
+    void updateUI() {
+        EditButtonBar::loadFromItems(m_buttonArray, m_fields->m_cols, m_fields->m_rows, false);
         if (auto ui = typeinfo_cast<EditorUI*>(getParent())) {
             // fix visible pages when opening editor, can be assumed as 0 as loadFromItems resets the page to 0
             for (auto barPages : CCArrayExt<CCNode*>(m_pagesArray)) {
@@ -248,7 +246,7 @@ class $modify(ScaledUI, EditorUI) {
         // Reload EditButtonBars to recenter
         for (auto c : CCArrayExt<CCNode*>(this->getChildren())) {
             if (auto bar = typeinfo_cast<EditButtonBar*>(c)) {
-                static_cast<BetterEditButtonBar*>(bar)->updateUI(true);
+                static_cast<BetterEditButtonBar*>(bar)->updateUI();
             }
         }