summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--doc/base/classes.xml16
-rw-r--r--platform/android/detect.py1
-rw-r--r--scene/main/viewport.cpp4
-rw-r--r--tools/editor/io_plugins/editor_mesh_import_plugin.cpp18
4 files changed, 26 insertions, 13 deletions
diff --git a/doc/base/classes.xml b/doc/base/classes.xml
index 43f755d246..653fa44d99 100644
--- a/doc/base/classes.xml
+++ b/doc/base/classes.xml
@@ -1103,7 +1103,7 @@
% key
</constant>
<constant name="KEY_AMPERSAND" value="38">
- & key
+ &amp; key
</constant>
<constant name="KEY_APOSTROPHE" value="39">
' key
@@ -7268,12 +7268,14 @@
<argument index="0" name="degrees" type="float">
</argument>
<description>
+ Set rotation of the layer in degree.
</description>
</method>
<method name="get_rotationd" qualifiers="const">
<return type="float">
</return>
<description>
+ Get rotation of the layer in degree.
</description>
</method>
<method name="set_scale">
@@ -12250,18 +12252,21 @@ This approximation makes straight segments between each point, then subdivides t
<argument index="0" name="dir" type="String">
</argument>
<description>
+ Set the current working directory of the file dialog.
</description>
</method>
<method name="set_current_file">
<argument index="0" name="file" type="String">
</argument>
<description>
+ Set the current selected file name of the file dialog.
</description>
</method>
<method name="set_current_path">
<argument index="0" name="path" type="String">
</argument>
<description>
+ Set the current selected file path of the file dialog.
</description>
</method>
<method name="set_mode">
@@ -12282,6 +12287,7 @@ This approximation makes straight segments between each point, then subdivides t
<return type="VBoxContainer">
</return>
<description>
+ Return the vertical box container of the dialog, custom controls can be added to it.
</description>
</method>
<method name="set_access">
@@ -12314,6 +12320,7 @@ This approximation makes straight segments between each point, then subdivides t
</method>
<method name="invalidate">
<description>
+ Invalidate and update the current dialog content list.
</description>
</method>
</methods>
@@ -12351,6 +12358,7 @@ This approximation makes straight segments between each point, then subdivides t
The dialog functions as a folder selector, disallowing the selection of any file.
</constant>
<constant name="MODE_OPEN_ANY" value="3">
+ The dialog allows the selection of a file or a directory.
</constant>
<constant name="MODE_SAVE_FILE" value="4">
The dialog will warn when a file exists.
@@ -21323,24 +21331,28 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
<argument index="0" name="enabled" type="bool">
</argument>
<description>
+ Set whether the window is minimized.
</description>
</method>
<method name="is_window_minimized" qualifiers="const">
<return type="bool">
</return>
<description>
+ Return true if the window is minimized.
</description>
</method>
<method name="set_window_maximized">
<argument index="0" name="enabled" type="bool">
</argument>
<description>
+ Set the window size to maximized.
</description>
</method>
<method name="is_window_maximized" qualifiers="const">
<return type="bool">
</return>
<description>
+ Return true if the window is maximized.
</description>
</method>
<method name="set_borderless_window">
@@ -21578,6 +21590,7 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
<return type="int">
</return>
<description>
+ Return the current unix timestamp.
</description>
</method>
<method name="get_datetime_from_unix_time" qualifiers="const">
@@ -21740,6 +21753,7 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
<return type="String">
</return>
<description>
+ Return the absolute directory path of user data path([user://]).
</description>
</method>
<method name="get_system_dir" qualifiers="const">
diff --git a/platform/android/detect.py b/platform/android/detect.py
index 7d7fd174e5..11b14eb989 100644
--- a/platform/android/detect.py
+++ b/platform/android/detect.py
@@ -21,7 +21,6 @@ def get_opts():
return [
('ANDROID_NDK_ROOT', 'the path to Android NDK', os.environ.get("ANDROID_NDK_ROOT", 0)),
- ('NDK_TOOLCHAIN', 'toolchain to use for the NDK',"arm-eabi-4.4.0"),
('NDK_TARGET', 'toolchain to use for the NDK',os.environ.get("NDK_TARGET", "arm-linux-androideabi-4.9")),
('NDK_TARGET_X86', 'toolchain to use for the NDK x86',os.environ.get("NDK_TARGET_X86", "x86-4.9")),
('ndk_platform', 'compile for platform: (android-<api> , example: android-15)',"android-15"),
diff --git a/scene/main/viewport.cpp b/scene/main/viewport.cpp
index c9f61beba7..2a057fc424 100644
--- a/scene/main/viewport.cpp
+++ b/scene/main/viewport.cpp
@@ -1841,6 +1841,8 @@ void Viewport::_gui_input_event(InputEvent p_event) {
if (gui.mouse_over)
gui.mouse_over->notification(Control::NOTIFICATION_MOUSE_EXIT);
+
+ _gui_cancel_tooltip();
if (over)
over->notification(Control::NOTIFICATION_MOUSE_ENTER);
@@ -1849,8 +1851,6 @@ void Viewport::_gui_input_event(InputEvent p_event) {
gui.mouse_over=over;
- _gui_cancel_tooltip();
-
if (gui.drag_preview) {
gui.drag_preview->set_pos(mpos);
}
diff --git a/tools/editor/io_plugins/editor_mesh_import_plugin.cpp b/tools/editor/io_plugins/editor_mesh_import_plugin.cpp
index e628bed2dd..49d35220d4 100644
--- a/tools/editor/io_plugins/editor_mesh_import_plugin.cpp
+++ b/tools/editor/io_plugins/editor_mesh_import_plugin.cpp
@@ -207,6 +207,13 @@ public:
return;
}
+ String dst = save_path->get_text();
+ if (dst=="") {
+ error_dialog->set_text(TTR("Save path is empty!"));
+ error_dialog->popup_centered_minsize();
+ return;
+ }
+
for(int i=0;i<meshes.size();i++) {
Ref<ResourceImportMetadata> imd = memnew( ResourceImportMetadata );
@@ -224,16 +231,9 @@ public:
imd->add_source(EditorImportPlugin::validate_source_path(meshes[i]));
- String dst = save_path->get_text();
- if (dst=="") {
- error_dialog->set_text(TTR("Save path is empty!"));
- error_dialog->popup_centered_minsize();
- return;
- }
-
- dst = dst.plus_file(meshes[i].get_file().basename()+".msh");
+ String file_path = dst.plus_file(meshes[i].get_file().basename()+".msh");
- plugin->import(dst,imd);
+ plugin->import(file_path,imd);
}
hide();
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-22 01:21:29 +0000