asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #48378 from Calinou/editor-improve-audio-inspector-preview

Browse source 
Improve the editor audio preview inspector appearance and functionality
This commit is contained in:
Rémi Verschelde 2021-05-04 17:58:28 +02:00 committed by GitHub
commit e189ff55a7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
editor/plugins/audio_stream_editor_plugin.cpp
View file

@ -32,6 +32,7 @@
#include "core/config/project_settings.h" #include "core/config/project_settings.h"
#include "core/io/resource_loader.h" #include "core/io/resource_loader.h"
#include "core/os/keyboard.h"
#include "editor/audio_stream_preview.h" #include "editor/audio_stream_preview.h"
#include "editor/editor_scale.h" #include "editor/editor_scale.h"
#include "editor/editor_settings.h" #include "editor/editor_settings.h"
@ -144,23 +145,26 @@ void AudioStreamEditor::_draw_indicator() {
Rect2 rect = _preview->get_rect(); Rect2 rect = _preview->get_rect();
float len = stream->get_length(); float len = stream->get_length();
float ofs_x = _current / len * rect.size.width; float ofs_x = _current / len * rect.size.width;
_indicator->draw_line(Point2(ofs_x, 0), Point2(ofs_x, rect.size.height), get_theme_color("accent_color", "Editor"), 1); const Color color = get_theme_color("accent_color", "Editor");
_indicator->draw_line(Point2(ofs_x, 0), Point2(ofs_x, rect.size.height), color, Math::round(2 * EDSCALE));
_indicator->draw_texture(
get_theme_icon("TimelineIndicator", "EditorIcons"),
Point2(ofs_x - get_theme_icon("TimelineIndicator", "EditorIcons")->get_width() * 0.5, 0),
color);
_current_label->set_text(String::num(_current, 2).pad_decimals(2) + " /"); _current_label->set_text(String::num(_current, 2).pad_decimals(2) + " /");
} }
void AudioStreamEditor::_on_input_indicator(Ref<InputEvent> p_event) { void AudioStreamEditor::_on_input_indicator(Ref<InputEvent> p_event) {
Ref<InputEventMouseButton> mb = p_event; const Ref<InputEventMouseButton> mb = p_event;
if (mb.is_valid() && mb->get_button_index() == MOUSE_BUTTON_LEFT) {
if (mb.is_valid()) {
if (mb->is_pressed()) { if (mb->is_pressed()) {
_seek_to(mb->get_position().x); _seek_to(mb->get_position().x);
} }
_dragging = mb->is_pressed(); _dragging = mb->is_pressed();
} }
Ref<InputEventMouseMotion> mm = p_event; const Ref<InputEventMouseMotion> mm = p_event;
if (mm.is_valid()) { if (mm.is_valid()) {
if (_dragging) { if (_dragging) {
_seek_to(mm->get_position().x); _seek_to(mm->get_position().x);
@ -228,6 +232,7 @@ AudioStreamEditor::AudioStreamEditor() {
hbox->add_child(_play_button); hbox->add_child(_play_button);
_play_button->set_focus_mode(Control::FOCUS_NONE); _play_button->set_focus_mode(Control::FOCUS_NONE);
_play_button->connect("pressed", callable_mp(this, &AudioStreamEditor::_play)); _play_button->connect("pressed", callable_mp(this, &AudioStreamEditor::_play));
_play_button->set_shortcut(ED_SHORTCUT("inspector/audio_preview_play_pause", TTR("Audio Preview Play/Pause"), KEY_SPACE));
_stop_button = memnew(Button); _stop_button = memnew(Button);
_stop_button->set_flat(true); _stop_button->set_flat(true);