Restore Ezbaze's other work that was lost in the rebase

Author: Keavon

editor/src/messages/portfolio/document/node_graph/node_properties.rs

@@ -1211,16 +1211,16 @@ pub(crate) fn grid_properties(node_id: NodeId, context: &mut NodePropertiesConte
 		}
 	}
 
-	let rows = number_widget(
-		ParameterWidgetsInfo::from_index(document_node, node_id, RowsInput::INDEX, true, context),
-		NumberInput::default().min(1.),
-	);
 	let columns = number_widget(
 		ParameterWidgetsInfo::from_index(document_node, node_id, ColumnsInput::INDEX, true, context),
 		NumberInput::default().min(1.),
 	);
+	let rows = number_widget(
+		ParameterWidgetsInfo::from_index(document_node, node_id, RowsInput::INDEX, true, context),
+		NumberInput::default().min(1.),
+	);
 
-	widgets.extend([LayoutGroup::Row { widgets: rows }, LayoutGroup::Row { widgets: columns }]);
+	widgets.extend([LayoutGroup::Row { widgets: columns }, LayoutGroup::Row { widgets: rows }]);
 
 	widgets
 }

frontend/src/components/floating-menus/NodeCatalog.svelte

@@ -164,6 +164,7 @@
 					.text-label {
 						padding-left: 16px;
 						position: relative;
+						pointer-events: none;
 
 						&::before {
 							content: "";

node-graph/gcore/src/vector/generator_nodes.rs

@@ -158,8 +158,8 @@ fn grid<T: GridSpacing>(
 	#[implementations(f64, DVec2)]
 	spacing: T,
 	#[default(30., 30.)] angles: DVec2,
-	#[default(10)] rows: u32,
 	#[default(10)] columns: u32,
+	#[default(10)] rows: u32,
 ) -> VectorDataTable {
 	let (x_spacing, y_spacing) = spacing.as_dvec2().into();
 	let (angle_a, angle_b) = angles.into();