Skip to content

mac: Setting to explicitly choose pan or zoom for mouse wheel (#1339) #1344

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nanoant wants to merge 1 commit into
base: master
Choose a base branch
from
Open

mac: Setting to explicitly choose pan or zoom for mouse wheel (#1339) #1344

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions src/confscreen.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,13 @@ void TextWindow::ScreenChangeCanvasSizeAuto(int link, uint32_t v) {
SS.GW.Invalidate();
}

void TextWindow::ScreenChangeMouseScrollAction(int link, uint32_t v) {
if(link == 'c') {
SS.mouseScrollAction = (SolveSpaceUI::MouseScrollAction)v;
}
SS.GW.Invalidate();
}

void TextWindow::ScreenChangeCanvasSize(int link, uint32_t v) {
double d;
switch(v) {
Expand Down Expand Up @@ -353,6 +360,23 @@ void TextWindow::ShowConfiguration() {
Printf(false, "%Ba %d %Fl%Ll%f[change]%E",
SS.timeoutRedundantConstr, &ScreenChangeFindConstraintTimeout);

#if defined(__APPLE__)
Printf(false, "");
Printf(false, "%Ft mouse scroll / touch pad action");
Printf(false, "%Ba %f%D%Lc%Fd%s auto%E "
"%f%D%Lc%Fd%s pan%E "
"%f%D%Lc%Fd%s zoom%E",
&ScreenChangeMouseScrollAction,
SolveSpaceUI::MouseScrollAction::AUTO,
(SS.mouseScrollAction == SolveSpaceUI::MouseScrollAction::AUTO) ? RADIO_TRUE : RADIO_FALSE,
&ScreenChangeMouseScrollAction,
SolveSpaceUI::MouseScrollAction::PAN,
(SS.mouseScrollAction == SolveSpaceUI::MouseScrollAction::PAN) ? RADIO_TRUE : RADIO_FALSE,
&ScreenChangeMouseScrollAction,
SolveSpaceUI::MouseScrollAction::ZOOM,
(SS.mouseScrollAction == SolveSpaceUI::MouseScrollAction::ZOOM) ? RADIO_TRUE : RADIO_FALSE);
#endif

if(canvas) {
const char *gl_vendor, *gl_renderer, *gl_version;
canvas->GetIdent(&gl_vendor, &gl_renderer, &gl_version);
Expand Down
5 changes: 3 additions & 2 deletions src/platform/guimac.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -586,8 +586,9 @@ - (void)scrollWheel:(NSEvent *)nsEvent {
nsEvent.subtype == NSEventSubtypeTabletPoint &&
kind == Platform::Window::Kind::TOPLEVEL;
}
// Check if we are scrolling on trackpad and handle things differently.
if(scrollFromTrackpadTouch) {
// Check if we are scrolling on trackpad or asked to always pan and then handle things differently.
if((SS.mouseScrollAction == SolveSpaceUI::MouseScrollAction::AUTO && scrollFromTrackpadTouch) ||
(SS.mouseScrollAction == SolveSpaceUI::MouseScrollAction::PAN && kind == Platform::Window::Kind::TOPLEVEL)) {
// This is how Cocoa represents 2 finger trackpad drag gestures, rather than going via
// NSPanGestureRecognizer which is how you might expect this to work... We complicate this
// further by also handling shift-two-finger-drag to mean rotate. Fortunately we're using
Expand Down
4 changes: 4 additions & 0 deletions src/solvespace.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,8 @@ void SolveSpaceUI::Init() {
backgroundColor = settings->ThawColor("BackgroundColor", RGBi(0, 0, 0));
// Whether export canvas size is fixed or derived from bbox
exportCanvasSizeAuto = settings->ThawBool("ExportCanvasSizeAuto", true);
// Mouse scroll action
mouseScrollAction = (MouseScrollAction)settings->ThawInt("MouseScrollAction", (uint32_t)MouseScrollAction::AUTO);
// Margins for automatic canvas size
exportMargin.left = settings->ThawFloat("ExportMargin_Left", 5.0);
exportMargin.right = settings->ThawFloat("ExportMargin_Right", 5.0);
Expand Down Expand Up @@ -295,6 +297,8 @@ void SolveSpaceUI::Exit() {
settings->FreezeBool("ShowToolbar", showToolbar);
// Autosave timer
settings->FreezeInt("AutosaveInterval", autosaveInterval);
// Mouse scroll action
settings->FreezeInt("MouseScrollAction", (uint32_t)mouseScrollAction);

// And the default styles, colors and line widths and such.
Style::FreezeDefaultStyles(settings);
Expand Down
6 changes: 6 additions & 0 deletions src/solvespace.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -608,6 +608,12 @@ class SolveSpaceUI {
double feed;
double plungeFeed;
} gCode;
enum class MouseScrollAction : uint32_t {
AUTO,
PAN,
ZOOM,
};
MouseScrollAction mouseScrollAction;

Unit viewUnits;
int afterDecimalMm;
Expand Down
1 change: 1 addition & 0 deletions src/ui.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -455,6 +455,7 @@ class TextWindow {
static void ScreenChangeCanvasSizeAuto(int link, uint32_t v);
static void ScreenChangeCanvasSize(int link, uint32_t v);
static void ScreenChangeShadedTriangles(int link, uint32_t v);
static void ScreenChangeMouseScrollAction(int link, uint32_t v);

static void ScreenAllowRedundant(int link, uint32_t v);

Expand Down