Skip to content

Commit

Permalink
Merge pull request #47255 from Calinou/fix-windows-tablet-setting-name
Browse files Browse the repository at this point in the history
Fix feature tag casing in the Windows pen tablet project setting name
  • Loading branch information
akien-mga authored Mar 22, 2021
2 parents e0f1928 + 6c9259f commit 725552a
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion doc/classes/ProjectSettings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -734,7 +734,7 @@
<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.
</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.
</member>
<member name="input_devices/pointing/emulate_mouse_from_touch" type="bool" setter="" getter="" default="true">
Expand Down
4 changes: 2 additions & 2 deletions main/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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.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"));
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"));
}

if (tablet_driver == "") { // specified in project.godot
Expand Down

0 comments on commit 725552a

Please sign in to comment.