Răsfoiți Sursa

fixed search menu scaling being weird on non-retina screens

Jonathan Higgins 7 luni în urmă
părinte
comite
d274316c98
2 a modificat fișierele cu 7 adăugiri și 4 ștergeri
  1. 2 2
      scenes/main/control.tscn
  2. 5 2
      scenes/menu/search_menu.gd

+ 2 - 2
scenes/main/control.tscn

@@ -387,9 +387,9 @@ popup_window = true
 
 [node name="Label" type="Label" parent="CheckForUpdates/UpdatePopup"]
 offset_left = 14.0
-offset_top = 8.0
+offset_top = 6.0
 offset_right = 366.0
-offset_bottom = 65.0
+offset_bottom = 63.0
 text = "A new version of SoundThread (0.0.0) is available to download."
 horizontal_alignment = 1
 vertical_alignment = 1

+ 5 - 2
scenes/menu/search_menu.gd

@@ -63,9 +63,12 @@ func display_items(filter: String):
 		btn.connect("pressed", Callable(self, "_on_item_selected").bind(key)) #pass key (process name) when button is pressed
 		item_container.add_child(btn)
 	
-	#resize menu within certain bounds
+	#resize menu within certain bounds #50
 	await get_tree().process_frame
-	self.size.y = min((item_container.size.y * DisplayServer.screen_get_scale()) + search_bar.size.y + 50, 410 * DisplayServer.screen_get_scale()) #i think this will scale for retina screens but might be wrong
+	if DisplayServer.screen_get_scale() > 1:
+		self.size.y = min((item_container.size.y * DisplayServer.screen_get_scale()) + search_bar.size.y + 50, 410 * DisplayServer.screen_get_scale()) #i think this will scale for retina screens but might be wrong
+	else:
+		self.size.y = min(item_container.size.y + search_bar.size.y + 12, 410)
 	
 func _on_search_bar_text_changed(new_text: String) -> void:
 	display_items(new_text)