fix(plymouth): remove lock icon, scale entry to 60%, fix bullet positions

commit: c9abb5ef0d184fd5a7e2c332d4d69009b96834d8
author: brice · 7mo ago · 2026-02-28 06:28 UTC
parent: e68bcf8
signature: GPG VerifiedCD88F9E564E0102646FB6077A1A07C7C7C3E349D · arch-gpg Verified for the committer email

1 file · +13 -22

M assets/plymouth/archup.script +13 -22


@@ -101,13 +101,11 @@ fun hide_progress_bar()
101	101
102	102		fun show_password_dialog()
103	103		{
104		-	lock.sprite.SetOpacity(1);
105	104		entry.sprite.SetOpacity(1);
106	105		}
107	106
108	107		fun hide_password_dialog()
109	108		{
110		-	lock.sprite.SetOpacity(0);
111	109		entry.sprite.SetOpacity(0);
112	110		for (index = 0; bullet.sprites[index]; index++)
113	111		bullet.sprites[index].SetOpacity(0);

@@ -133,39 +131,32 @@ fun stop_fake_progress()
133	131
134	132		#----------------------------------------- Dialogue --------------------------------
135	133
136		-	lock.image = Image("lock.png");
137	134		entry.image = Image("entry.png");
138	135		bullet.image = Image("bullet.png");
139	136
	137	+	# Scale entry to 60% of its original size
	138	+	entry.scaled_image = entry.image.Scale(
	139	+	Math.Int(entry.image.GetWidth() * 0.6),
	140	+	Math.Int(entry.image.GetHeight() * 0.6)
	141	+	);
	142	+
140	143		# Gap between logo bottom and entry top when password dialog is shown
141	144		dialog_gap = 40;
142	145
143	146		# Total height of logo + gap + entry when grouped for password dialog
144		-	dialog_group_height = logo.image.GetHeight() + dialog_gap + entry.image.GetHeight();
	147	+	dialog_group_height = logo.image.GetHeight() + dialog_gap + entry.scaled_image.GetHeight();
145	148
146	149		# Vertical start so the group is centered on screen
147	150		dialog_group_y = Window.GetHeight() / 2 - dialog_group_height / 2;
148	151
149	152		# Entry sits below the logo in password mode
150	153		entry.dialog_y = dialog_group_y + logo.image.GetHeight() + dialog_gap;
151		-	entry.x = Window.GetWidth() / 2 - entry.image.GetWidth() / 2;
	154	+	entry.x = Window.GetWidth() / 2 - entry.scaled_image.GetWidth() / 2;
152	155
153		-	entry.sprite = Sprite(entry.image);
	156	+	entry.sprite = Sprite(entry.scaled_image);
154	157		entry.sprite.SetPosition(entry.x, entry.dialog_y, 10001);
155	158		entry.sprite.SetOpacity(0);
156	159
157		-	# Scale lock icon to match entry field height
158		-	lock_height = entry.image.GetHeight() * 0.8;
159		-	lock_scale = lock_height / 96;
160		-	lock_width = 84 * lock_scale;
161		-
162		-	scaled_lock = lock.image.Scale(lock_width, lock_height);
163		-	lock.sprite = Sprite(scaled_lock);
164		-	lock.x = entry.x - lock_width - 15;
165		-	lock.y = entry.dialog_y + entry.image.GetHeight() / 2 - lock_height / 2;
166		-	lock.sprite.SetPosition(lock.x, lock.y, 10001);
167		-	lock.sprite.SetOpacity(0);
168		-
169	160		# Bullet array
170	161		bullet.sprites = [];
171	162

@@ -217,11 +208,11 @@ fun display_password_callback (prompt, bullets)
217	208		{
218	209		if (!bullet.sprites[index])
219	210		{
220		-	# Scale bullet image to 7x7 pixels
221		-	scaled_bullet = bullet.image.Scale(7, 7);
	211	+	# Scale bullet image to 6x6 pixels
	212	+	scaled_bullet = bullet.image.Scale(6, 6);
222	213		bullet.sprites[index] = Sprite(scaled_bullet);
223		-	bullet.x = entry.x + 20 + index * (7 + 5);
224		-	bullet.y = entry.dialog_y + entry.image.GetHeight() / 2 - 3.5;
	214	+	bullet.x = entry.x + 12 + index * (6 + 4);
	215	+	bullet.y = entry.dialog_y + entry.scaled_image.GetHeight() / 2 - 3;
225	216		bullet.sprites[index].SetPosition(bullet.x, bullet.y, 10002);
226	217		}
227	218		bullet.sprites[index].SetOpacity(1);

 fun show_password_dialog()
   {
-    lock.sprite.SetOpacity(1);
     entry.sprite.SetOpacity(1);
   }
 fun hide_password_dialog()
   {
-    lock.sprite.SetOpacity(0);
     entry.sprite.SetOpacity(0);
     for (index = 0; bullet.sprites[index]; index++)
       bullet.sprites[index].SetOpacity(0);
 #----------------------------------------- Dialogue --------------------------------
-lock.image = Image("lock.png");
 entry.image = Image("entry.png");
 bullet.image = Image("bullet.png");
+# Scale entry to 60% of its original size
+entry.scaled_image = entry.image.Scale(
+  Math.Int(entry.image.GetWidth() * 0.6),
+  Math.Int(entry.image.GetHeight() * 0.6)
+);
 # Gap between logo bottom and entry top when password dialog is shown
 dialog_gap = 40;
 # Total height of logo + gap + entry when grouped for password dialog
-dialog_group_height = logo.image.GetHeight() + dialog_gap + entry.image.GetHeight();
+dialog_group_height = logo.image.GetHeight() + dialog_gap + entry.scaled_image.GetHeight();
 # Vertical start so the group is centered on screen
 dialog_group_y = Window.GetHeight() / 2 - dialog_group_height / 2;
 # Entry sits below the logo in password mode
 entry.dialog_y = dialog_group_y + logo.image.GetHeight() + dialog_gap;
-entry.x = Window.GetWidth() / 2 - entry.image.GetWidth() / 2;
+entry.x = Window.GetWidth() / 2 - entry.scaled_image.GetWidth() / 2;
-entry.sprite = Sprite(entry.image);
+entry.sprite = Sprite(entry.scaled_image);
 entry.sprite.SetPosition(entry.x, entry.dialog_y, 10001);
 entry.sprite.SetOpacity(0);
-# Scale lock icon to match entry field height
-lock_height = entry.image.GetHeight() * 0.8;
-lock_scale = lock_height / 96;
-lock_width = 84 * lock_scale;
-scaled_lock = lock.image.Scale(lock_width, lock_height);
-lock.sprite = Sprite(scaled_lock);
-lock.x = entry.x - lock_width - 15;
-lock.y = entry.dialog_y + entry.image.GetHeight() / 2 - lock_height / 2;
-lock.sprite.SetPosition(lock.x, lock.y, 10001);
-lock.sprite.SetOpacity(0);
 # Bullet array
 bullet.sprites = [];
       {
         if (!bullet.sprites[index])
           {
-            # Scale bullet image to 7x7 pixels
+            # Scale bullet image to 6x6 pixels
-            scaled_bullet = bullet.image.Scale(7, 7);
+            scaled_bullet = bullet.image.Scale(6, 6);
             bullet.sprites[index] = Sprite(scaled_bullet);
-            bullet.x = entry.x + 20 + index * (7 + 5);
+            bullet.x = entry.x + 12 + index * (6 + 4);
-            bullet.y = entry.dialog_y + entry.image.GetHeight() / 2 - 3.5;
+            bullet.y = entry.dialog_y + entry.scaled_image.GetHeight() / 2 - 3;
             bullet.sprites[index].SetPosition(bullet.x, bullet.y, 10002);
           }
         bullet.sprites[index].SetOpacity(1);