summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <remi@verschelde.fr>2022-07-06 07:59:33 +0200
committerGitHub <noreply@github.com>2022-07-06 07:59:33 +0200
commit08e8e6739e4edd4a8b92ba9629169577b55c5c36 (patch)
treec0d1023383c65bc4bf8e47f01ebdbb4c3a042450
parent8dfdb71f8e7355df1e1002b9c0491dfceb17fe6e (diff)
parent983ce7e9f37dbf36da3fa3775e315cf0ba40989a (diff)
Merge pull request #62755 from Calinou/videostreamplayer-default-disable-expand
Disable Expand by default in VideoStreamPlayer
-rw-r--r--doc/classes/VideoStreamPlayer.xml2
-rw-r--r--scene/gui/video_stream_player.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/classes/VideoStreamPlayer.xml b/doc/classes/VideoStreamPlayer.xml
index 092a754a39..f6594ff9e7 100644
--- a/doc/classes/VideoStreamPlayer.xml
+++ b/doc/classes/VideoStreamPlayer.xml
@@ -58,7 +58,7 @@
<member name="bus" type="StringName" setter="set_bus" getter="get_bus" default="&amp;&quot;Master&quot;">
Audio bus to use for sound playback.
</member>
- <member name="expand" type="bool" setter="set_expand" getter="has_expand" default="true">
+ <member name="expand" type="bool" setter="set_expand" getter="has_expand" default="false">
If [code]true[/code], the video scales to the control size. Otherwise, the control minimum size will be automatically adjusted to match the video stream's dimensions.
</member>
<member name="paused" type="bool" setter="set_paused" getter="is_paused" default="false">
diff --git a/scene/gui/video_stream_player.h b/scene/gui/video_stream_player.h
index d2822a989b..913e7905b6 100644
--- a/scene/gui/video_stream_player.h
+++ b/scene/gui/video_stream_player.h
@@ -64,7 +64,7 @@ class VideoStreamPlayer : public Control {
bool autoplay = false;
float volume = 1.0;
double last_audio_time = 0.0;
- bool expand = true;
+ bool expand = false;
bool loops = false;
int buffering_ms = 500;
int audio_track = 0;