Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
godot
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
community
godot
Commits
6ad814bf
Unverified
Commit
6ad814bf
authored
Jun 24, 2020
by
Rémi Verschelde
Committed by
GitHub
Jun 24, 2020
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #39775 from Chaosus/fix_error_label
Fix error label clicking in status bar for shader editor
parents
7d60a888
25cb5a42
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
1 addition
and
8 deletions
+1
-8
code_editor.cpp
editor/code_editor.cpp
+1
-2
script_text_editor.cpp
editor/plugins/script_text_editor.cpp
+0
-5
script_text_editor.h
editor/plugins/script_text_editor.h
+0
-1
No files found.
editor/code_editor.cpp
View file @
6ad814bf
...
...
@@ -1541,7 +1541,7 @@ void CodeTextEditor::_toggle_scripts_pressed() {
void
CodeTextEditor
::
_error_pressed
(
const
Ref
<
InputEvent
>
&
p_event
)
{
Ref
<
InputEventMouseButton
>
mb
=
p_event
;
if
(
mb
.
is_valid
()
&&
mb
->
is_pressed
()
&&
mb
->
get_button_index
()
==
BUTTON_LEFT
)
{
emit_signal
(
"error_pressed"
);
goto_error
(
);
}
}
...
...
@@ -1651,7 +1651,6 @@ void CodeTextEditor::_bind_methods() {
ADD_SIGNAL
(
MethodInfo
(
"validate_script"
));
ADD_SIGNAL
(
MethodInfo
(
"load_theme_settings"
));
ADD_SIGNAL
(
MethodInfo
(
"show_warnings_panel"
));
ADD_SIGNAL
(
MethodInfo
(
"error_pressed"
));
}
void
CodeTextEditor
::
set_code_complete_func
(
CodeTextEditorCodeCompleteFunc
p_code_complete_func
,
void
*
p_ud
)
{
...
...
editor/plugins/script_text_editor.cpp
View file @
6ad814bf
...
...
@@ -383,10 +383,6 @@ void ScriptTextEditor::_show_warnings_panel(bool p_show) {
warnings_panel
->
set_visible
(
p_show
);
}
void
ScriptTextEditor
::
_error_pressed
()
{
code_editor
->
goto_error
();
}
void
ScriptTextEditor
::
_warning_clicked
(
Variant
p_line
)
{
if
(
p_line
.
get_type
()
==
Variant
::
INT
)
{
code_editor
->
get_text_edit
()
->
cursor_set_line
(
p_line
.
operator
int64_t
());
...
...
@@ -1759,7 +1755,6 @@ ScriptTextEditor::ScriptTextEditor() {
warnings_panel
->
set_focus_mode
(
FOCUS_CLICK
);
warnings_panel
->
hide
();
code_editor
->
connect
(
"error_pressed"
,
callable_mp
(
this
,
&
ScriptTextEditor
::
_error_pressed
));
code_editor
->
connect
(
"show_warnings_panel"
,
callable_mp
(
this
,
&
ScriptTextEditor
::
_show_warnings_panel
));
warnings_panel
->
connect
(
"meta_clicked"
,
callable_mp
(
this
,
&
ScriptTextEditor
::
_warning_clicked
));
...
...
editor/plugins/script_text_editor.h
View file @
6ad814bf
...
...
@@ -159,7 +159,6 @@ protected:
void
_load_theme_settings
();
void
_set_theme_for_script
();
void
_show_warnings_panel
(
bool
p_show
);
void
_error_pressed
();
void
_warning_clicked
(
Variant
p_line
);
void
_notification
(
int
p_what
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment