wilderjds
/
xournalpp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Settings: Allow disabling GTK inertial touch scrolling. (#3379)

Browse Source 
* Settings: Allow disabling GTK inertial touch scrolling.

Co-authored-by: Bryan Tan <Technius@users.noreply.github.com>
upstream-master
Henry Heino 5 years ago committed by GitHub
parent 4f045d579d
commit 5eb00d7116
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 100 additions and 5 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 15
      src/control/settings/Settings.cpp
  2. 11
      src/control/settings/Settings.h
  3. 9
      src/gui/MainWindow.cpp
  4. 2
      src/gui/dialog/SettingsDialog.cpp
  5. 68
      ui/settings.glade

15
src/control/settings/Settings.cpp
Unescape View File

@ -114,6 +114,7 @@ void Settings::loadDefault() {
this->snapGridSize = DEFAULT_GRID_SIZE;
this->touchDrawing = false;
this->gtkTouchInertialScrolling = true;
this->defaultSaveName = _("%F-Note-%H-%M");
@ -465,6 +466,8 @@ void Settings::parseItem(xmlDocPtr doc, xmlNodePtr cur) {
this->snapGridTolerance = tempg_ascii_strtod(reinterpret_cast<const char*>(value), nullptr);
} else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("touchDrawing")) == 0) {
this->touchDrawing = xmlStrcmp(value, reinterpret_cast<const xmlChar*>("true")) == 0;
} else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("gtkTouchInertialScrolling")) == 0) {
this->gtkTouchInertialScrolling = xmlStrcmp(value, reinterpret_cast<const xmlChar*>("true")) == 0;
} else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("pressureGuessing")) == 0) {
this->pressureGuessing = xmlStrcmp(value, reinterpret_cast<const xmlChar*>("true")) == 0;
} else if (xmlStrcmp(name, reinterpret_cast<const xmlChar*>("scrollbarHideType")) == 0) {
@ -891,6 +894,7 @@ void Settings::save() {
SAVE_DOUBLE_PROP(snapGridSize);
SAVE_BOOL_PROP(touchDrawing);
SAVE_BOOL_PROP(gtkTouchInertialScrolling);
SAVE_BOOL_PROP(pressureGuessing);
SAVE_UINT_PROP(selectionBorderColor);
@ -1271,6 +1275,17 @@ void Settings::setTouchDrawingEnabled(bool b) {
save();
}
auto Settings::getGtkTouchInertialScrollingEnabled() const -> bool { return this->gtkTouchInertialScrolling; };
void Settings::setGtkTouchInertialScrollingEnabled(bool b) {
if (this->gtkTouchInertialScrolling == b) {
return;
}
this->gtkTouchInertialScrolling = b;
save();
}
auto Settings::isPressureGuessingEnabled() const -> bool { return this->pressureGuessing; }
void Settings::setPressureGuessingEnabled(bool b) {
if (this->pressureGuessing == b) {

11
src/control/settings/Settings.h
Unescape View File

@ -270,6 +270,9 @@ public:
bool getTouchDrawingEnabled() const;
void setTouchDrawingEnabled(bool b);
bool getGtkTouchInertialScrollingEnabled() const;
void setGtkTouchInertialScrollingEnabled(bool b);
bool isPressureGuessingEnabled() const;
void setPressureGuessingEnabled(bool b);
@ -892,14 +895,16 @@ private:
*/
double snapRotationTolerance{};
/// Grid size for Snapping
double snapGridSize{};
// Touchscreens act like multi-touch-aware pens.
/// Touchscreens act like multi-touch-aware pens.
bool touchDrawing{};
/// True iff we use GTK's built-in kinetic/inertial scrolling
/// for touchscreen devices. If false, we use our own.
bool gtkTouchInertialScrolling{};
/**
* Infer pressure from speed when device pressure
* is unavailable (e.g. drawing with a mouse).

9
src/gui/MainWindow.cpp
Unescape View File

@ -275,6 +275,10 @@ void MainWindow::setGtkTouchscreenScrollingForDeviceMapping() {
}
void MainWindow::setGtkTouchscreenScrollingEnabled(bool enabled) {
if (!control->getSettings()->getGtkTouchInertialScrollingEnabled()) {
enabled = false;
}
if (enabled == gtkTouchscreenScrollingEnabled.load() || winXournal == nullptr) {
return;
}
@ -283,8 +287,9 @@ void MainWindow::setGtkTouchscreenScrollingEnabled(bool enabled) {
Util::execInUiThread(
[=]() {
gtk_scrolled_window_set_kinetic_scrolling(GTK_SCROLLED_WINDOW(winXournal),
gtkTouchscreenScrollingEnabled.load());
const bool touchScrollEnabled = gtkTouchscreenScrollingEnabled.load();
gtk_scrolled_window_set_kinetic_scrolling(GTK_SCROLLED_WINDOW(winXournal), touchScrollEnabled);
},
G_PRIORITY_HIGH);
}

2
src/gui/dialog/SettingsDialog.cpp
Unescape View File

@ -357,6 +357,7 @@ void SettingsDialog::load() {
loadCheckbox("cbDisableScrollbarFadeout", settings->isScrollbarFadeoutDisabled());
loadCheckbox("cbEnablePressureInference", settings->isPressureGuessingEnabled());
loadCheckbox("cbTouchDrawing", settings->getTouchDrawingEnabled());
loadCheckbox("cbDisableGtkInertialScroll", !settings->getGtkTouchInertialScrollingEnabled());
const bool ignoreStylusEventsEnabled = settings->getIgnoredStylusEvents() != 0; // 0 means disabled, >0 enabled
loadCheckbox("cbIgnoreFirstStylusEvents", ignoreStylusEventsEnabled);
loadCheckbox("cbInputSystemTPCButton", settings->getInputSystemTPCButtonEnabled());
@ -682,6 +683,7 @@ void SettingsDialog::save() {
settings->setAreStockIconsUsed(getCheckbox("cbStockIcons"));
settings->setPressureGuessingEnabled(getCheckbox("cbEnablePressureInference"));
settings->setTouchDrawingEnabled(getCheckbox("cbTouchDrawing"));
settings->setGtkTouchInertialScrollingEnabled(!getCheckbox("cbDisableGtkInertialScroll"));
settings->setInputSystemTPCButtonEnabled(getCheckbox("cbInputSystemTPCButton"));
settings->setInputSystemDrawOutsideWindowEnabled(getCheckbox("cbInputSystemDrawOutsideWindow"));
settings->setScrollbarFadeoutDisabled(getCheckbox("cbDisableScrollbarFadeout"));

68
ui/settings.glade
Unescape View File

@ -2582,6 +2582,74 @@ This setting can make it easier to draw with touch. </property>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">3</property>
</packing>
</child>
<child>
<object class="GtkFrame" id="frameTouchScrolling">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label-xalign">0.01</property>
<child>
<object class="GtkAlignment" id="touchScrollingFrameAlignment">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="bottom-padding">8</property>
<property name="left-padding">12</property>
<property name="right-padding">12</property>
<child>
<object class="GtkBox" id="boxTouchScrolling">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="lblTouchKineticScrollDisableDescription">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">&lt;i&gt;Disabling GTK's built-in touchscreen scrolling can work around scrolling bugs on some platforms. Consider changing this setting if you experience jumps/sudden changes in scroll position when attempting to scroll with a touchscreen.&lt;/i&gt;</property>
<property name="use-markup">True</property>
<property name="wrap">True</property>
<property name="max-width-chars">85</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="cbDisableGtkInertialScroll">
<property name="label" translatable="yes">Disable GTK's built-in inertial scroll functionality (requires restart).</property>
<property name="name">cbTouchDrawing</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">False</property>
<property name="tooltip-text" translatable="yes">Use two fingers to pan/zoom and one finger to use the selected tool.</property>
<property name="xalign">0</property>
<property name="draw-indicator">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
</child>
</object>
</child>
<child type="label">
<object class="GtkLabel" id="headerTouchScrollingFrame">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Touch Scrolling</property>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>

Write Preview
Loading…
Cancel
Save