Merge pull request #1560 from LittleHuba/inputsystem_default

Switch to new inputsystem as default
presentation
Ulrich Huber 7 years ago committed by GitHub
commit e7dd5d7199
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 18
      CHANGELOG.md
  2. 14
      src/control/settings/Settings.cpp
  3. 2
      src/control/settings/Settings.h

@ -1,5 +1,23 @@
# Changelog
## Nightlies
* Audio playback
* Added seeking functionality
* Fixed race condition in audio system leading to crashes
* Fixed bug where gaps in the audio stream could appear while recording
* Input System
* Previous experimental input system is now default. Should errors occur
please file a bug report and deactivate it in the settings.
* Zoom gesture reimplemented for better compatibility
* LaTeX
* Added support for `\newline`
* Misc
* Updated to C++17
* Cleaned up the codebase (see ticket 1279 for details)
* Updated translations
* Introduced Flatpak Image
## 1.0.15
**Attention**: Please see the 1.0.14 patch notes before installing this version.

@ -140,7 +140,7 @@ void Settings::loadDefault()
this->pluginEnabled = "";
this->pluginDisabled = "";
this->experimentalInputSystemEnabled = false;
this->newInputSystemEnabled = true;
this->inputSystemTPCButton = false;
this->inputSystemDrawOutsideWindow = true;
@ -577,9 +577,9 @@ void Settings::parseItem(xmlDocPtr doc, xmlNodePtr cur)
{
this->audioOutputDevice = g_ascii_strtoll((const char *) value, nullptr, 10);
}
else if (xmlStrcmp(name, (const xmlChar*) "experimentalInputSystemEnabled") == 0)
else if (xmlStrcmp(name, (const xmlChar*) "newInputSystemEnabled") == 0)
{
this->experimentalInputSystemEnabled = xmlStrcmp(value, (const xmlChar*) "true") ? false : true;
this->newInputSystemEnabled = xmlStrcmp(value, (const xmlChar*) "true") ? false : true;
}
else if (xmlStrcmp(name, (const xmlChar*) "inputSystemTPCButton") == 0)
{
@ -1014,7 +1014,7 @@ void Settings::save()
WRITE_BOOL_PROP(doActionOnStrokeFiltered);
WRITE_BOOL_PROP(trySelectOnStrokeFiltered);
WRITE_BOOL_PROP(experimentalInputSystemEnabled);
WRITE_BOOL_PROP(newInputSystemEnabled);
WRITE_BOOL_PROP(inputSystemTPCButton);
WRITE_BOOL_PROP(inputSystemDrawOutsideWindow);
@ -2167,17 +2167,17 @@ bool Settings::getTrySelectOnStrokeFiltered() const
void Settings::setExperimentalInputSystemEnabled(bool systemEnabled)
{
if (this->experimentalInputSystemEnabled == systemEnabled)
if (this->newInputSystemEnabled == systemEnabled)
{
return;
}
this->experimentalInputSystemEnabled = systemEnabled;
this->newInputSystemEnabled = systemEnabled;
save();
}
bool Settings::getExperimentalInputSystemEnabled() const
{
return this->experimentalInputSystemEnabled;
return this->newInputSystemEnabled;
}
void Settings::setInputSystemTPCButtonEnabled(bool tpcButtonEnabled)

@ -821,7 +821,7 @@ private:
/**
* Whether the new experimental input system is activated
*/
bool experimentalInputSystemEnabled;
bool newInputSystemEnabled;
/**
* Whether Wacom parameter TabletPCButton is enabled

Loading…
Cancel
Save