godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-23 15:16:17 +00:00
Code Releases Wiki Activity

Bring that Whole New World to the Old Continent too

Browse Source 
Applies the clang-format style to the 2.1 branch as done for master in
5dbf1809c6.
This commit is contained in:
Rémi Verschelde
2017-03-19 00:36:26 +01:00
parent 1d418afe86
commit f8db8a3faa
1308 changed files with 147754 additions and 174357 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
editor/plugins/rich_text_editor_plugin.h
View File

@@ -29,10 +29,10 @@
#ifndef RICH_TEXT_EDITOR_PLUGIN_H
#define RICH_TEXT_EDITOR_PLUGIN_H
#include "editor/editor_plugin.h"
#include "editor/editor_node.h"
#include "scene/gui/rich_text_label.h"
#include "editor/editor_plugin.h"
#include "scene/gui/file_dialog.h"
#include "scene/gui/rich_text_label.h"
/**
@author Juan Linietsky <reduzio@gmail.com>
@@ -40,9 +40,9 @@
class RichTextEditor : public Control {
OBJ_TYPE(RichTextEditor, Control );
OBJ_TYPE(RichTextEditor, Control);
friend class RichTextEditorPlugin;
friend class RichTextEditorPlugin;
enum {
@@ -51,32 +51,31 @@ class RichTextEditor : public Control {
};
Panel *panel;
MenuButton *options;
MenuButton *options;
RichTextLabel *node;
EditorFileDialog *file_dialog;
void _file_selected(const String& p_path);
void _file_selected(const String &p_path);
void _menu_option(int p_option);
protected:
void _notification(int p_what);
void _node_removed(Node *p_node);
static void _bind_methods();
public:
public:
void edit(Node *p_rich_text);
RichTextEditor();
};
class RichTextEditorPlugin : public EditorPlugin {
OBJ_TYPE( RichTextEditorPlugin, EditorPlugin );
OBJ_TYPE(RichTextEditorPlugin, EditorPlugin);
RichTextEditor *rich_text_editor;
EditorNode *editor;
public:
virtual String get_name() const { return "RichText"; }
bool has_main_screen() const { return false; }
virtual void edit(Object *p_node);
@@ -85,7 +84,6 @@ public:
RichTextEditorPlugin(EditorNode *p_node);
~RichTextEditorPlugin();
};
#endif // RICH_TEXT_EDITOR_PLUGIN_H