Commit fc8c3bdf authored by mathieu _alkama_ m's avatar mathieu _alkama_ m Committed by Gargaj
Browse files

Custom scroll speed via config.json (#122)

parent cc60cf23
...@@ -55,6 +55,8 @@ The file can have the following contents: (all fields are optional) ...@@ -55,6 +55,8 @@ The file can have the following contents: (all fields are optional)
"tabSize": 8, "tabSize": 8,
"visibleWhitespace": true, "visibleWhitespace": true,
"autoIndent": "smart", // can be "none", "preserve" or "smart" "autoIndent": "smart", // can be "none", "preserve" or "smart"
"scrollXFactor": 1.0, // if horizontal scrolling is too slow you can speed it up here (or change direction)
"scrollYFactor": 1.0, // if vertical scrolling is too slow you can speed it up here (or change direction)
}, },
"midi":{ // the keys below will become the shader variable names, the values are the CC numbers "midi":{ // the keys below will become the shader variable names, the values are the CC numbers
"fMidiKnob": 16, // e.g. this would be CC#16, i.e. by default the leftmost knob on a nanoKONTROL 2 "fMidiKnob": 16, // e.g. this would be CC#16, i.e. by default the leftmost knob on a nanoKONTROL 2
......
...@@ -101,8 +101,8 @@ namespace Renderer ...@@ -101,8 +101,8 @@ namespace Renderer
struct MouseEvent struct MouseEvent
{ {
MOUSEEVENTTYPE eventType; MOUSEEVENTTYPE eventType;
int x; float x;
int y; float y;
MOUSEBUTTON button; MOUSEBUTTON button;
}; };
extern MouseEvent mouseEventBuffer[512]; extern MouseEvent mouseEventBuffer[512];
......
...@@ -147,6 +147,8 @@ int main(int argc, const char *argv[]) ...@@ -147,6 +147,8 @@ int main(int argc, const char *argv[])
int nTexPreviewWidth = 64; int nTexPreviewWidth = 64;
float fFFTSmoothingFactor = 0.9f; // higher value, smoother FFT float fFFTSmoothingFactor = 0.9f; // higher value, smoother FFT
float fFFTSlightSmoothingFactor = 0.6f; // higher value, smoother FFT float fFFTSlightSmoothingFactor = 0.6f; // higher value, smoother FFT
float fScrollXFactor = 1.0f;
float fScrollYFactor = 1.0f;
std::string sPostExitCmd; std::string sPostExitCmd;
...@@ -217,6 +219,10 @@ int main(int argc, const char *argv[]) ...@@ -217,6 +219,10 @@ int main(int argc, const char *argv[])
editorOptions.eAutoIndent = aitNone; editorOptions.eAutoIndent = aitNone;
} }
} }
if (options.get<jsonxx::Object>("gui").has<jsonxx::Number>("scrollXFactor"))
fScrollXFactor = options.get<jsonxx::Object>("gui").get<jsonxx::Number>("scrollXFactor");
if (options.get<jsonxx::Object>("gui").has<jsonxx::Number>("scrollYFactor"))
fScrollYFactor = options.get<jsonxx::Object>("gui").get<jsonxx::Number>("scrollYFactor");
} }
if (options.has<jsonxx::Object>("midi")) if (options.has<jsonxx::Object>("midi"))
{ {
...@@ -351,7 +357,7 @@ int main(int argc, const char *argv[]) ...@@ -351,7 +357,7 @@ int main(int argc, const char *argv[])
mShaderEditor.ButtonUp( Scintilla::Point( Renderer::mouseEventBuffer[i].x, Renderer::mouseEventBuffer[i].y ), time * 1000, false ); mShaderEditor.ButtonUp( Scintilla::Point( Renderer::mouseEventBuffer[i].x, Renderer::mouseEventBuffer[i].y ), time * 1000, false );
break; break;
case Renderer::MOUSEEVENTTYPE_SCROLL: case Renderer::MOUSEEVENTTYPE_SCROLL:
mShaderEditor.WndProc( SCI_LINESCROLL, -Renderer::mouseEventBuffer[i].x, -Renderer::mouseEventBuffer[i].y); mShaderEditor.WndProc( SCI_LINESCROLL, (int)(-Renderer::mouseEventBuffer[i].x * fScrollXFactor), (int)(-Renderer::mouseEventBuffer[i].y * fScrollYFactor));
break; break;
} }
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment