mirror of
https://github.com/aseprite/aseprite.git
synced 2025-03-29 19:20:09 +00:00
[x11] Add possibility to set a user-defined string to detect styluses (#3176)
This commit is contained in:
parent
f638b5ca2b
commit
94065571b5
@ -158,6 +158,7 @@
|
||||
<option id="show_menu_bar" type="bool" default="true" />
|
||||
<option id="recent_items" type="int" default="16" />
|
||||
<option id="osx_async_view" type="bool" default="true" />
|
||||
<option id="x11_stylus_id" type="std::string" />
|
||||
</section>
|
||||
<section id="undo" text="Undo">
|
||||
<option id="size_limit" type="int" default="0" />
|
||||
|
2
laf
2
laf
@ -1 +1 @@
|
||||
Subproject commit df53f4ac0cecada789bf84b4283947d2591833bd
|
||||
Subproject commit 8f9e7892e0da31e423e224b199f53d8ffefce32b
|
@ -71,6 +71,8 @@
|
||||
|
||||
#if LAF_MACOS
|
||||
#include "os/osx/system.h"
|
||||
#elif LAF_LINUX
|
||||
#include "os/x11/system.h"
|
||||
#endif
|
||||
|
||||
#include <iostream>
|
||||
@ -236,6 +238,7 @@ int App::initialize(const AppOptions& options)
|
||||
m_coreModules = new CoreModules;
|
||||
|
||||
#if LAF_WINDOWS
|
||||
|
||||
if (options.disableWintab() ||
|
||||
!preferences().experimental.loadWintabDriver() ||
|
||||
preferences().tablet.api() == "pointer") {
|
||||
@ -245,11 +248,20 @@ int App::initialize(const AppOptions& options)
|
||||
system->setTabletAPI(os::TabletAPI::WintabPackets);
|
||||
else // preferences().tablet.api() == "wintab"
|
||||
system->setTabletAPI(os::TabletAPI::Wintab);
|
||||
#endif
|
||||
|
||||
#if LAF_MACOS
|
||||
#elif LAF_MACOS
|
||||
|
||||
if (!preferences().general.osxAsyncView())
|
||||
os::osx_set_async_view(false);
|
||||
|
||||
#elif LAF_LINUX
|
||||
|
||||
{
|
||||
const std::string& stylusId = preferences().general.x11StylusId();
|
||||
if (!stylusId.empty())
|
||||
os::x11_set_user_defined_string_to_detect_stylus(stylusId);
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
system->setAppName(get_app_name());
|
||||
|
Loading…
x
Reference in New Issue
Block a user