Browse Source

fix and no shadow

Laserlicht 1 year ago
parent
commit
e963550431

+ 0 - 1
client/lobby/CBonusSelection.h

@@ -31,7 +31,6 @@ class ISelectionScreenInfo;
 class ExtraOptionsTab;
 class ExtraOptionsTab;
 class VideoWidgetOnce;
 class VideoWidgetOnce;
 class CBonusSelection;
 class CBonusSelection;
-class CFilledTexture;
 
 
 
 
 /// Campaign screen where you can choose one out of three starting bonuses
 /// Campaign screen where you can choose one out of three starting bonuses

+ 1 - 1
client/media/CVideoHandler.cpp

@@ -344,7 +344,7 @@ FFMpegStream::~FFMpegStream()
 
 
 Point CVideoInstance::size()
 Point CVideoInstance::size()
 {
 {
-	return dimensions;
+	return dimensions / GH.screenHandler().getScalingFactor();
 }
 }
 
 
 void CVideoInstance::show(const Point & position, Canvas & canvas)
 void CVideoInstance::show(const Point & position, Canvas & canvas)

+ 1 - 3
client/windows/GUIClasses.cpp

@@ -1609,7 +1609,7 @@ void CObjectListWindow::keyPressed(EShortcut key)
 }
 }
 
 
 VideoWindow::VideoWindow(VideoPath video, ImagePath rim, bool showBackground, float scaleFactor, std::function<void(bool skipped)> closeCb)
 VideoWindow::VideoWindow(VideoPath video, ImagePath rim, bool showBackground, float scaleFactor, std::function<void(bool skipped)> closeCb)
-	: CWindowObject(BORDERED | NEEDS_ANIMATED_BACKGROUND), closeCb(closeCb)
+	: CWindowObject(BORDERED | SHADOW_DISABLED | NEEDS_ANIMATED_BACKGROUND), closeCb(closeCb)
 {
 {
 	OBJECT_CONSTRUCTION;
 	OBJECT_CONSTRUCTION;
 
 
@@ -1631,8 +1631,6 @@ VideoWindow::VideoWindow(VideoPath video, ImagePath rim, bool showBackground, fl
 
 
 	if(!rim.empty())
 	if(!rim.empty())
 		setBackground(rim);
 		setBackground(rim);
-	
-	updateShadow();
 }
 }
 
 
 void VideoWindow::exit(bool skipped)
 void VideoWindow::exit(bool skipped)