#2358: fixed horizontal scroll in the code editor

nesbox · Nov 25, 2023 · 4441c9c · 4441c9c
1 parent e7b1624
commit 4441c9c
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 8 deletions.
diff --git a/build/assets/config.tic.dat b/build/assets/config.tic.dat
diff --git a/config.lua b/config.lua
@@ -31,7 +31,6 @@ THEME=
 CHECK_NEW_VERSION=true
 SOFTWARE_RENDERING=false
 UI_SCALE=4
-REVERT_SCROLL=false
 
 ---------------------------
 function TIC()

diff --git a/src/studio/config.c b/src/studio/config.c
@@ -155,7 +155,6 @@ static void readConfig(Config* config)
             readGlobalBool(lua,     "CHECK_NEW_VERSION",    &config->data.checkNewVersion);
             readGlobalInteger(lua,  "UI_SCALE",             &config->data.uiScale);
             readGlobalBool(lua,     "SOFTWARE_RENDERING",   &config->data.soft);
-            readGlobalBool(lua,     "REVERT_SCROLL",        &config->data.revertScroll);
 
             if(config->data.uiScale <= 0)
                 config->data.uiScale = 1;

diff --git a/src/studio/editors/code.c b/src/studio/editors/code.c
@@ -3122,7 +3122,7 @@ static void textEditTick(Code* code)
         tic_point scroll = {input->mouse.scrollx, input->mouse.scrolly};
 
         if(tic_api_key(tic, tic_key_shift))
-            scroll.x = scroll.y;
+            scroll.x = -scroll.y;
 
         s32* val = scroll.x ? &code->scroll.x : scroll.y ? &code->scroll.y : NULL;
 

diff --git a/src/studio/studio.c b/src/studio/studio.c
@@ -2139,9 +2139,6 @@ static void processMouseStates(Studio* studio)
 
         state->dbl.ticks++;
     }
-
-    if(getConfig(studio)->revertScroll)
-        tic->ram->input.mouse.scrolly *= -1;
 }
 
 static void blitCursor(Studio* studio)

diff --git a/src/studio/system.h b/src/studio/system.h
@@ -119,7 +119,6 @@ typedef struct
     bool checkNewVersion;
     bool cli;
     bool soft;
-    bool revertScroll;
 
     struct StudioOptions
     {