Merge branch 'Melanosuchus/rotate_scale_dialogs' into 'master'
authorMario <zacjardine@y7mail.com>
Mon, 20 Jul 2015 02:35:04 +0000 (02:35 +0000)
committerMario <zacjardine@y7mail.com>
Mon, 20 Jul 2015 02:35:04 +0000 (02:35 +0000)
Don't call Cancel from OK in the Arbitrary rotation and scale dialogs

Effects:
* Pressing enter applies the transformation before closing the dialog
* Pressing OK doesn't clear the values

See merge request !4

radiant/select.cpp

index 4246ab4..5d34645 100644 (file)
@@ -900,7 +900,7 @@ static gboolean rotatedlg_cancel( GtkWidget *widget, RotateDialog* rotateDialog
 
 static gboolean rotatedlg_ok( GtkWidget *widget, RotateDialog* rotateDialog ){
        rotatedlg_apply( widget, rotateDialog );
-       rotatedlg_cancel( widget, rotateDialog );
+       gtk_widget_hide( GTK_WIDGET( rotateDialog->window ) );
        return TRUE;
 }
 
@@ -1052,7 +1052,7 @@ static gboolean scaledlg_cancel( GtkWidget *widget, ScaleDialog* scaleDialog ){
 
 static gboolean scaledlg_ok( GtkWidget *widget, ScaleDialog* scaleDialog ){
        scaledlg_apply( widget, scaleDialog );
-       scaledlg_cancel( widget, scaleDialog );
+       gtk_widget_hide( GTK_WIDGET( scaleDialog->window ) );
        return TRUE;
 }