godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #47255 from Calinou/fix-windows-tablet-setting-name 

Fix feature tag casing in the Windows pen tablet project setting name
This commit is contained in:
Rémi Verschelde 2021-03-23 00:00:36 +01:00 committed by GitHub
parent e0f19287f7 6c9259ff2f
commit 725552af69
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/classes/ProjectSettings.xml
View File

@ -734,7 +734,7 @@
<member name="input_devices/pen_tablet/driver" type="String" setter="" getter=""> <member name="input_devices/pen_tablet/driver" type="String" setter="" getter="">
Specifies the tablet driver to use. If left empty, the default driver will be used. Specifies the tablet driver to use. If left empty, the default driver will be used.
</member> </member>
<member name="input_devices/pen_tablet/driver.windows" type="String" setter="" getter=""> <member name="input_devices/pen_tablet/driver.Windows" type="String" setter="" getter="">
Override for [member input_devices/pen_tablet/driver] on Windows. Override for [member input_devices/pen_tablet/driver] on Windows.
</member> </member>
<member name="input_devices/pointing/emulate_mouse_from_touch" type="bool" setter="" getter="" default="true"> <member name="input_devices/pointing/emulate_mouse_from_touch" type="bool" setter="" getter="" default="true">

4
main/main.cpp
View File

@ -1551,8 +1551,8 @@ Error Main::setup2(Thread::ID p_main_tid_override) {
{ {
GLOBAL_DEF_RST_NOVAL("input_devices/pen_tablet/driver", ""); GLOBAL_DEF_RST_NOVAL("input_devices/pen_tablet/driver", "");
GLOBAL_DEF_RST_NOVAL("input_devices/pen_tablet/driver.windows", ""); GLOBAL_DEF_RST_NOVAL("input_devices/pen_tablet/driver.Windows", "");
ProjectSettings::get_singleton()->set_custom_property_info("input_devices/pen_tablet/driver.windows", PropertyInfo(Variant::STRING, "input_devices/pen_tablet/driver.windows", PROPERTY_HINT_ENUM, "wintab,winink")); ProjectSettings::get_singleton()->set_custom_property_info("input_devices/pen_tablet/driver.Windows", PropertyInfo(Variant::STRING, "input_devices/pen_tablet/driver.Windows", PROPERTY_HINT_ENUM, "wintab,winink"));
} }
if (tablet_driver == "") { // specified in project.godot if (tablet_driver == "") { // specified in project.godot