Merge branch 'Melanosuchus/rotate_scale_dialogs' into 'master'

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

diff --git a/radiant/select.cpp b/radiant/select.cpp
index 4246ab428d0eee68eb287baaa080d5dd0e57f37d..5d34645a8e4dccf267213cdaffe6b6687d386b8b 100644 (file)
--- a/radiant/select.cpp
+++ b/radiant/select.cpp
@@ -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;
 }