Merge commit '23d2497f12fe91a5eb0e14b71095cbb1c2ec80cb' into garux-merge

[xonotic/netradiant.git] / radiant / select.cpp

diff --git a/radiant/select.cpp b/radiant/select.cpp
index 7a40bb35eeab2035df480d91d5de2f9454ae423b..eb2cacbd8129ea80a5d76decef17c5a6aabf248a 100644 (file)
--- a/radiant/select.cpp
+++ b/radiant/select.cpp
@@ -694,6 +694,24 @@ void Select_FitTexture( float horizontal, float vertical ){
        SceneChangeNotify();
 }
 
+void Select_FitTextureW( float horizontal, float vertical ){
+       if ( GlobalSelectionSystem().Mode() != SelectionSystem::eComponent ) {
+               Scene_BrushFitTexture_SelectedW( GlobalSceneGraph(), horizontal, vertical );
+       }
+       Scene_BrushFitTexture_Component_SelectedW( GlobalSceneGraph(), horizontal, vertical );
+
+       SceneChangeNotify();
+}
+
+void Select_FitTextureH( float horizontal, float vertical ){
+       if ( GlobalSelectionSystem().Mode() != SelectionSystem::eComponent ) {
+               Scene_BrushFitTexture_SelectedH( GlobalSceneGraph(), horizontal, vertical );
+       }
+       Scene_BrushFitTexture_Component_SelectedH( GlobalSceneGraph(), horizontal, vertical );
+
+       SceneChangeNotify();
+}
+
 inline void hide_node( scene::Node& node, bool hide ){
        hide
        ? node.enable( scene::Node::eHidden )
@@ -874,6 +892,9 @@ struct RotateDialog
 static gboolean rotatedlg_apply( ui::Widget widget, RotateDialog* rotateDialog ){
        Vector3 eulerXYZ;
 
+       gtk_spin_button_update ( rotateDialog->x );
+       gtk_spin_button_update ( rotateDialog->y );
+       gtk_spin_button_update ( rotateDialog->z );
        eulerXYZ[0] = static_cast<float>( gtk_spin_button_get_value( rotateDialog->x ) );
        eulerXYZ[1] = static_cast<float>( gtk_spin_button_get_value( rotateDialog->y ) );
        eulerXYZ[2] = static_cast<float>( gtk_spin_button_get_value( rotateDialog->z ) );
@@ -898,6 +919,7 @@ static gboolean rotatedlg_cancel( ui::Widget widget, RotateDialog* rotateDialog
 
 static gboolean rotatedlg_ok( ui::Widget widget, RotateDialog* rotateDialog ){
        rotatedlg_apply( widget, rotateDialog );
+//     rotatedlg_cancel( widget, rotateDialog );
        rotateDialog->window.hide();
        return TRUE;
 }
@@ -1038,6 +1060,7 @@ static gboolean scaledlg_cancel( ui::Widget widget, ScaleDialog* scaleDialog ){
 
 static gboolean scaledlg_ok( ui::Widget widget, ScaleDialog* scaleDialog ){
        scaledlg_apply( widget, scaleDialog );
+       //scaledlg_cancel( widget, scaleDialog );
        scaleDialog->window.hide();
        return TRUE;
 }