Skip to content

Commit

Permalink
Fix AudioStreamPlayer icons, improve audio resource picker styling
Browse files Browse the repository at this point in the history
  • Loading branch information
ckaiser committed Jun 27, 2024
1 parent 7907ef8 commit 04f6435
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 8 deletions.
8 changes: 3 additions & 5 deletions editor/editor_resource_picker.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1065,7 +1065,7 @@ EditorResourcePicker::EditorResourcePicker(bool p_hide_assign_button_controls) {
}

edit_button = memnew(Button);
edit_button->set_flat(true);
edit_button->set_flat(false);
edit_button->set_toggle_mode(true);
edit_button->connect(SceneStringName(pressed), callable_mp(this, &EditorResourcePicker::_update_menu));
add_child(edit_button);
Expand Down Expand Up @@ -1268,8 +1268,6 @@ void EditorAudioStreamPicker::_preview_draw() {
if (audio_stream->get_length() > 0 && size.width > 0) {
rect.size.height *= 0.5;

stream_preview_rect->draw_rect(rect, Color(0, 0, 0, 1));

Ref<AudioStreamPreview> preview = AudioStreamPreviewGenerator::get_singleton()->generate_preview(audio_stream);
float preview_len = preview->get_length();

Expand Down Expand Up @@ -1325,8 +1323,8 @@ void EditorAudioStreamPicker::_preview_draw() {
text = audio_stream->get_class().replace_first("AudioStream", "");
}

stream_preview_rect->draw_texture(icon, Point2i(EDSCALE * 2, rect.position.y + (rect.size.height - icon->get_height()) / 2), icon_modulate);
stream_preview_rect->draw_string(font, Point2i(EDSCALE * 2 + icon->get_width(), rect.position.y + font->get_ascent(font_size) + (rect.size.height - font->get_height(font_size)) / 2), text, HORIZONTAL_ALIGNMENT_CENTER, size.width - 4 * EDSCALE - icon->get_width());
stream_preview_rect->draw_texture(icon, Point2i(EDSCALE * 4, rect.position.y + (rect.size.height - icon->get_height()) / 2), icon_modulate);
stream_preview_rect->draw_string(font, Point2i(EDSCALE * 4 + icon->get_width(), rect.position.y + font->get_ascent(font_size) + (rect.size.height - font->get_height(font_size)) / 2), text, HORIZONTAL_ALIGNMENT_CENTER, size.width - 4 * EDSCALE - icon->get_width(), font_size, get_theme_color(SNAME("font_color"), EditorStringName(Editor)));
}

EditorAudioStreamPicker::EditorAudioStreamPicker() :
Expand Down
2 changes: 1 addition & 1 deletion editor/icons/AudioStreamPlayer.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion editor/icons/AudioStreamPlayer2D.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion editor/icons/AudioStreamPlayer3D.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 04f6435

Please sign in to comment.