Explorar el Código

tools: use ColorButtonVector3

Daniele Bartolini hace 5 años
padre
commit
7d460da368

+ 12 - 20
tools/level_editor/preferences_dialog.vala

@@ -15,22 +15,22 @@ namespace Crown
 
 		// Widgets
 		[GtkChild]
-		Gtk.ColorButton _grid_color_button;
+		ColorButtonVector3 _grid_color_button;
 
 		[GtkChild]
-		Gtk.ColorButton _grid_disabled_color_button;
+		ColorButtonVector3 _grid_disabled_color_button;
 
 		[GtkChild]
-		Gtk.ColorButton _axis_x_color_button;
+		ColorButtonVector3 _axis_x_color_button;
 
 		[GtkChild]
-		Gtk.ColorButton _axis_y_color_button;
+		ColorButtonVector3 _axis_y_color_button;
 
 		[GtkChild]
-		Gtk.ColorButton _axis_z_color_button;
+		ColorButtonVector3 _axis_z_color_button;
 
 		[GtkChild]
-		Gtk.ColorButton _axis_selected_color_button;
+		ColorButtonVector3 _axis_selected_color_button;
 
 		[GtkChild]
 		Gtk.SpinButton _gizmo_size_spin_button;
@@ -46,23 +46,15 @@ namespace Crown
 			this.title = "Preferences";
 		}
 
-		private static Vector3 rgba_to_vector3(Gdk.RGBA rgba)
-		{
-			double r = rgba.red;
-			double g = rgba.green;
-			double b = rgba.blue;
-			return Vector3(r, g, b);
-		}
-
 		[GtkCallback]
 		private void on_color_set()
 		{
-			_application._editor.send_script(LevelEditorApi.set_color("grid", rgba_to_vector3(_grid_color_button.get_rgba())));
-			_application._editor.send_script(LevelEditorApi.set_color("grid_disabled", rgba_to_vector3(_grid_disabled_color_button.get_rgba())));
-			_application._editor.send_script(LevelEditorApi.set_color("axis_x", rgba_to_vector3(_axis_x_color_button.get_rgba())));
-			_application._editor.send_script(LevelEditorApi.set_color("axis_y", rgba_to_vector3(_axis_y_color_button.get_rgba())));
-			_application._editor.send_script(LevelEditorApi.set_color("axis_z", rgba_to_vector3(_axis_z_color_button.get_rgba())));
-			_application._editor.send_script(LevelEditorApi.set_color("axis_selected", rgba_to_vector3(_axis_selected_color_button.get_rgba())));
+			_application._editor.send_script(LevelEditorApi.set_color("grid", _grid_color_button.value));
+			_application._editor.send_script(LevelEditorApi.set_color("grid_disabled", _grid_disabled_color_button.value));
+			_application._editor.send_script(LevelEditorApi.set_color("axis_x", _axis_x_color_button.value));
+			_application._editor.send_script(LevelEditorApi.set_color("axis_y", _axis_y_color_button.value));
+			_application._editor.send_script(LevelEditorApi.set_color("axis_z", _axis_z_color_button.value));
+			_application._editor.send_script(LevelEditorApi.set_color("axis_selected", _axis_selected_color_button.value));
 		}
 
 		[GtkCallback]

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 2372 - 2371
tools/level_editor/resources/gresources.c


+ 6 - 6
tools/level_editor/resources/ui/preferences_dialog.ui

@@ -72,7 +72,7 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkColorButton" id="_grid_color_button">
+                  <object class="CrownColorButtonVector3" id="_grid_color_button">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -100,7 +100,7 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkColorButton" id="_grid_disabled_color_button">
+                  <object class="CrownColorButtonVector3" id="_grid_disabled_color_button">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -143,7 +143,7 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkColorButton" id="_axis_x_color_button">
+                  <object class="CrownColorButtonVector3" id="_axis_x_color_button">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -195,7 +195,7 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkColorButton" id="_axis_y_color_button">
+                  <object class="CrownColorButtonVector3" id="_axis_y_color_button">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -211,7 +211,7 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkColorButton" id="_axis_z_color_button">
+                  <object class="CrownColorButtonVector3" id="_axis_z_color_button">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -239,7 +239,7 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkColorButton" id="_axis_selected_color_button">
+                  <object class="CrownColorButtonVector3" id="_axis_selected_color_button">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>

Algunos archivos no se mostraron porque demasiados archivos cambiaron en este cambio