diff options
author | Rémi Verschelde <rverschelde@gmail.com> | 2020-05-14 14:29:06 +0200 |
---|---|---|
committer | Rémi Verschelde <rverschelde@gmail.com> | 2020-05-14 16:54:55 +0200 |
commit | 07bc4e2f96f8f47991339654ff4ab16acc19d44f (patch) | |
tree | 43cdc7cfe8239c23065616a931de3769d2db1e86 /scene/gui/file_dialog.cpp | |
parent | 0be6d925dc3c6413bce7a3ccb49631b8e4a6e67a (diff) | |
download | redot-engine-07bc4e2f96f8f47991339654ff4ab16acc19d44f.tar.gz |
Style: Enforce separation line between function definitions
I couldn't find a tool that enforces it, so I went the manual route:
```
find -name "thirdparty" -prune \
-o -name "*.cpp" -o -name "*.h" -o -name "*.m" -o -name "*.mm" \
-o -name "*.glsl" > files
perl -0777 -pi -e 's/\n}\n([^#])/\n}\n\n\1/g' $(cat files)
misc/scripts/fix_style.sh -c
```
This adds a newline after all `}` on the first column, unless they
are followed by `#` (typically `#endif`). This leads to having lots
of places with two lines between function/class definitions, but
clang-format then fixes it as we enforce max one line of separation.
This doesn't fix potential occurrences of function definitions which
are indented (e.g. for a helper class defined in a .cpp), but it's
better than nothing. Also can't be made to run easily on CI/hooks so
we'll have to be careful with new code.
Part of #33027.
Diffstat (limited to 'scene/gui/file_dialog.cpp')
-rw-r--r-- | scene/gui/file_dialog.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/scene/gui/file_dialog.cpp b/scene/gui/file_dialog.cpp index adf67bc7df..158662e0fc 100644 --- a/scene/gui/file_dialog.cpp +++ b/scene/gui/file_dialog.cpp @@ -541,6 +541,7 @@ void FileDialog::clear_filters() { update_filters(); invalidate(); } + void FileDialog::add_filter(const String &p_filter) { filters.push_back(p_filter); update_filters(); @@ -560,17 +561,21 @@ Vector<String> FileDialog::get_filters() const { String FileDialog::get_current_dir() const { return dir->get_text(); } + String FileDialog::get_current_file() const { return file->get_text(); } + String FileDialog::get_current_path() const { return dir->get_text().plus_file(file->get_text()); } + void FileDialog::set_current_dir(const String &p_dir) { dir_access->change_dir(p_dir); update_dir(); invalidate(); } + void FileDialog::set_current_file(const String &p_file) { file->set_text(p_file); update_dir(); @@ -582,6 +587,7 @@ void FileDialog::set_current_file(const String &p_file) { file->grab_focus(); } } + void FileDialog::set_current_path(const String &p_path) { if (!p_path.size()) return; |