add fix for bug1332 for mga1 branch update mga1 branch to 1.5.0.18distro/mga1

2 files changed, 42 insertions, 30 deletions

diff --git a/Makefile b/Makefile
index 5df474d..cf2f943 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 NAME=mageia-theme
 PACKAGE=mageia-theme
-VERSION=1.5.0.17
+VERSION=1.5.0.18
 
 THEMES=Mageia-Default
 
diff --git a/common/plymouth/mga.script b/common/plymouth/mga.script
index 27dae2b..f0fb428 100644
--- a/common/plymouth/mga.script
+++ b/common/plymouth/mga.script
@@ -1,3 +1,4 @@
+ 
 # Mga splashy like theme
 
 Window.GetMaxWidth = fun (){
@@ -48,64 +49,76 @@ else {
   }
 }
 
+scalewidth = Window.GetMaxWidth() / background.original_image.GetWidth();
+scaleheight = Window.GetMaxHeight() / background.original_image.GetHeight();
+logo.image = logo.original_image.Scale(logo.original_image.GetWidth() * scalewidth, logo.original_image.GetHeight() * scaleheight);
 logo.sprite = SpriteNew();
-logo.sprite.SetImage(logo.original_image);
+logo.sprite.SetImage(logo.image);
 logo.opacity_angle = 0;
 logo.sprite.SetY(Window.GetHeight() * 0.7 - logo.original_image.GetHeight() / 2);
 
-progressbar1 = ImageNew("progress-bar1.png");
+progressbar1.original_image = ImageNew("progress-bar1.png");
+progressbar1.image = progressbar1.original_image.Scale(progressbar1.original_image.GetWidth() * scalewidth, progressbar1.original_image.GetHeight() * scaleheight);
 progressbar1.sprite = SpriteNew();
-progressbar1.sprite.SetImage(progressbar1);
+progressbar1.sprite.SetImage(progressbar1.image);
 progressbar1.opacity_angle = 0;
-progressbar1.sprite.SetY(Window.GetHeight() * 0.7 - progressbar1.GetHeight() / 2);
+progressbar1.sprite.SetY(Window.GetHeight() * 0.7 - progressbar1.original_image.GetHeight() / 2);
 
-progressbar2 = ImageNew("progress-bar2.png");
+progressbar2.original_image = ImageNew("progress-bar2.png");
+progressbar2.image = progressbar2.original_image.Scale(progressbar2.original_image.GetWidth() * scalewidth, progressbar2.original_image.GetHeight() * scaleheight);
 progressbar2.sprite = SpriteNew();
-progressbar2.sprite.SetImage(progressbar2);
+progressbar2.sprite.SetImage(progressbar2.image);
 progressbar2.opacity_angle = 0;
-progressbar2.sprite.SetY(Window.GetHeight() * 0.7 - progressbar2.GetHeight() / 2);
+progressbar2.sprite.SetY(Window.GetHeight() * 0.7 - progressbar2.original_image.GetHeight() / 2);
 
-progressbar3 = ImageNew("progress-bar3.png");
+progressbar3.original_image = ImageNew("progress-bar3.png");
+progressbar3.image = progressbar3.original_image.Scale(progressbar3.original_image.GetWidth() * scalewidth, progressbar3.original_image.GetHeight() * scaleheight);
 progressbar3.sprite = SpriteNew();
-progressbar3.sprite.SetImage(progressbar3);
+progressbar3.sprite.SetImage(progressbar3.image);
 progressbar3.opacity_angle = 0;
-progressbar3.sprite.SetY(Window.GetHeight() * 0.7 - progressbar3.GetHeight() / 2);
+progressbar3.sprite.SetY(Window.GetHeight() * 0.7 - progressbar3.original_image.GetHeight() / 2);
 
-progressbar4 = ImageNew("progress-bar4.png");
+progressbar4.original_image = ImageNew("progress-bar4.png");
+progressbar4.image = progressbar4.original_image.Scale(progressbar4.original_image.GetWidth() * scalewidth, progressbar4.original_image.GetHeight() * scaleheight);
 progressbar4.sprite = SpriteNew();
-progressbar4.sprite.SetImage(progressbar4);
+progressbar4.sprite.SetImage(progressbar4.image);
 progressbar4.opacity_angle = 0;
-progressbar4.sprite.SetY(Window.GetHeight() * 0.7 - progressbar4.GetHeight() / 2);
+progressbar4.sprite.SetY(Window.GetHeight() * 0.7 - progressbar4.original_image.GetHeight() / 2);
 
-progressbar5 = ImageNew("progress-bar5.png");
+progressbar5.original_image = ImageNew("progress-bar5.png");
+progressbar5.image = progressbar5.original_image.Scale(progressbar5.original_image.GetWidth() * scalewidth, progressbar5.original_image.GetHeight() * scaleheight);
 progressbar5.sprite = SpriteNew();
-progressbar5.sprite.SetImage(progressbar5);
+progressbar5.sprite.SetImage(progressbar5.image);
 progressbar5.opacity_angle = 0;
-progressbar5.sprite.SetY(Window.GetHeight() * 0.7 - progressbar5.GetHeight() / 2);
+progressbar5.sprite.SetY(Window.GetHeight() * 0.7 - progressbar5.original_image.GetHeight() / 2);
 
-progressbar6 = ImageNew("progress-bar6.png");
+progressbar6.original_image = ImageNew("progress-bar6.png");
+progressbar6.image = progressbar6.original_image.Scale(progressbar6.original_image.GetWidth() * scalewidth, progressbar6.original_image.GetHeight() * scaleheight);
 progressbar6.sprite = SpriteNew();
-progressbar6.sprite.SetImage(progressbar6);
+progressbar6.sprite.SetImage(progressbar6.image);
 progressbar6.opacity_angle = 0;
-progressbar6.sprite.SetY(Window.GetHeight() * 0.7 - progressbar6.GetHeight() / 2);
+progressbar6.sprite.SetY(Window.GetHeight() * 0.7 - progressbar6.original_image.GetHeight() / 2);
 
-progressbar7 = ImageNew("progress-bar7.png");
+progressbar7.original_image = ImageNew("progress-bar7.png");
+progressbar7.image = progressbar7.original_image.Scale(progressbar7.original_image.GetWidth() * scalewidth, progressbar7.original_image.GetHeight() * scaleheight);
 progressbar7.sprite = SpriteNew();
-progressbar7.sprite.SetImage(progressbar7);
+progressbar7.sprite.SetImage(progressbar7.image);
 progressbar7.opacity_angle = 0;
-progressbar7.sprite.SetY(Window.GetHeight() * 0.7 - progressbar7.GetHeight() / 2);
+progressbar7.sprite.SetY(Window.GetHeight() * 0.7 - progressbar7.original_image.GetHeight() / 2);
 
-progressbar8 = ImageNew("progress-bar8.png");
+progressbar8.original_image = ImageNew("progress-bar8.png");
+progressbar8.image = progressbar8.original_image.Scale(progressbar8.original_image.GetWidth() * scalewidth, progressbar8.original_image.GetHeight() * scaleheight);
 progressbar8.sprite = SpriteNew();
-progressbar8.sprite.SetImage(progressbar8);
+progressbar8.sprite.SetImage(progressbar8.image);
 progressbar8.opacity_angle = 0;
-progressbar8.sprite.SetY(Window.GetHeight() * 0.7 - progressbar8.GetHeight() / 2);
+progressbar8.sprite.SetY(Window.GetHeight() * 0.7 - progressbar8.original_image.GetHeight() / 2);
 
-progressbar9 = ImageNew("progress-bar9.png");
+progressbar9.original_image = ImageNew("progress-bar9.png");
+progressbar9.image = progressbar9.original_image.Scale(progressbar9.original_image.GetWidth() * scalewidth, progressbar9.original_image.GetHeight() * scaleheight);
 progressbar9.sprite = SpriteNew();
-progressbar9.sprite.SetImage(progressbar9);
+progressbar9.sprite.SetImage(progressbar9.image);
 progressbar9.opacity_angle = 0;
-progressbar9.sprite.SetY(Window.GetHeight() * 0.7 - progressbar9.GetHeight() / 2);
+progressbar9.sprite.SetY(Window.GetHeight() * 0.7 - progressbar9.original_image.GetHeight() / 2);
 
 if (Plymouth.GetMode() == "shutdown") {
   progressbar9.sprite.SetOpacity(1);
@@ -402,4 +415,3 @@ fun quit_callback ()
 }
 
 Plymouth.SetQuitFunction(quit_callback);
-