Merge commit '9d6e27e4e37e7406e8691594fb0b74aab89e954b' into garux-merge

diff --git a/libs/gtkutil/cursor.cpp b/libs/gtkutil/cursor.cpp
index 999621f12ecdb4f633076aace99cd2579bbee9be..70a0856b68ea9af66e3fbdcbf287825bce8b677e 100644 (file)
--- a/libs/gtkutil/cursor.cpp
+++ b/libs/gtkutil/cursor.cpp
@@ -27,7 +27,7 @@
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
 
-
+#if 0
 GdkCursor* create_blank_cursor(){
        return gdk_cursor_new(GDK_BLANK_CURSOR);
 }
@@ -41,6 +41,7 @@ void blank_cursor( ui::Widget widget ){
 void default_cursor( ui::Widget widget ){
        gdk_window_set_cursor( gtk_widget_get_window(widget), 0 );
 }
+#endif
 
 
 void Sys_GetCursorPos( ui::Window window, int *x, int *y ){

diff --git a/libs/gtkutil/cursor.h b/libs/gtkutil/cursor.h
index 2d16142eb9f71134c1bb93ae384632024c837565..3b873db4f92e88fffc0b1a8e087c51282148a1aa 100644 (file)
--- a/libs/gtkutil/cursor.h
+++ b/libs/gtkutil/cursor.h
@@ -29,9 +29,11 @@
 typedef struct _GdkCursor GdkCursor;
 typedef struct _GdkEventMotion GdkEventMotion;
 
+#if 0
 GdkCursor* create_blank_cursor();
 void blank_cursor( ui::Widget widget );
 void default_cursor( ui::Widget widget );
+#endif
 void Sys_GetCursorPos( ui::Window window, int *x, int *y );
 void Sys_SetCursorPos( ui::Window window, int x, int y );
 
@@ -107,7 +109,8 @@ void motion_delta( int x, int y, unsigned int state ){
 class FreezePointer
 {
 unsigned int handle_motion;
-int recorded_x, recorded_y, last_x, last_y;
+int recorded_x, recorded_y, last_x, last_y, center_x, center_y;
+GtkWidget* weedjet;
 typedef void ( *MotionDeltaFunction )( int x, int y, unsigned int state, void* data );
 MotionDeltaFunction m_function;
 void* m_data;

diff --git a/radiant/camwindow.cpp b/radiant/camwindow.cpp
index 2ef5a9862a71d5c9396370c7037397a0aa192521..c96ee2f92cf97d1e0feec4bcd838b85e9249bf70 100644 (file)
--- a/radiant/camwindow.cpp
+++ b/radiant/camwindow.cpp
@@ -1319,7 +1319,7 @@ void CamWnd::EnableFreeMove(){
 
        gtk_window_set_focus( m_parent, m_gl_widget );
        m_freemove_handle_focusout = m_gl_widget.connect( "focus_out_event", G_CALLBACK( camwindow_freemove_focusout ), this );
-       m_freezePointer.freeze_pointer( m_parent, Camera_motionDelta, &m_Camera );
+       m_freezePointer.freeze_pointer( m_parent, m_gl_widget, Camera_motionDelta, &m_Camera );
 
        CamWnd_Update( *this );
 }

diff --git a/radiant/gtkdlgs.cpp b/radiant/gtkdlgs.cpp
index 0a2206069f6a78f98c009dfc6abde978bc32f126..c7bd3a581bf23eebee130f76b923e221f3a505a4 100644 (file)
--- a/radiant/gtkdlgs.cpp
+++ b/radiant/gtkdlgs.cpp
@@ -1041,7 +1041,7 @@ void DoTextEditor( const char* filename, int cursorpos, int length ){
                        ShellExecute( (HWND)GDK_WINDOW_HWND( gtk_widget_get_window( MainFrame_getWindow() ) ), "open", path.c_str(), 0, 0, SW_SHOW );
                }
                else{
-                       globalOutputStream() << "Failed to open '" << filename << "\n";
+                       globalOutputStream() << "Failed to open '" << filename << "'\nOne sits in .pk3 most likely!\n";
                }
                return;
        }
@@ -1062,7 +1062,7 @@ void DoTextEditor( const char* filename, int cursorpos, int length ){
                        DoGtkTextEditor( path.c_str(), cursorpos, length );
                }
                else{
-                       globalOutputStream() << "Failed to open '" << filename << "\n";
+                       globalOutputStream() << "Failed to open '" << filename << "'\nOne sits in .pk3 most likely!\n";
                }
                return;
        }

diff --git a/radiant/mainframe.cpp b/radiant/mainframe.cpp
index 63431679ef0f63f2a0b198b5796987b4268a9ed8..0141220bb7231c7adc0d8be9f26e423c96cd55f3 100644 (file)
--- a/radiant/mainframe.cpp
+++ b/radiant/mainframe.cpp
@@ -3192,7 +3192,7 @@ void MainFrame::Create(){
                vbox.pack_start( split, TRUE, TRUE, 0 );
 
                {
-            auto frame = create_framed_widget( TextureBrowser_constructWindow( window ) );
+            auto frame = create_framed_widget( TextureBrowser_constructWindow( GroupDialog_getWindow() ) );
                        g_page_textures = GroupDialog_addPage( "Textures", frame, TextureBrowserExportTitleCaller() );
 #ifndef GARUX_GTK_WORKAROUND
                        /* workaround for gtk 2.24 issue: not displayed glwidget after toggle */

diff --git a/radiant/texwindow.cpp b/radiant/texwindow.cpp
index 754c84445ba699c7bcb54039cb5c4df144448ed9..6f9205953d4bde22ae4c687834f39d0bdeaf9b26 100644 (file)
--- a/radiant/texwindow.cpp
+++ b/radiant/texwindow.cpp
@@ -329,51 +329,12 @@ bool m_hideUnused;
 bool m_rmbSelected;
 bool m_searchedTags;
 bool m_tags;
+bool m_move_started;
 // The uniform size (in pixels) that textures are resized to when m_resizeTextures is true.
 int m_uniformTextureSize;
 int m_uniformTextureMinSize;
 
 // Return the display width of a texture in the texture browser
-/*void getTextureWH( qtexture_t* tex, int *width, int *height ){
-       if ( !g_TextureBrowser_fixedSize ) {
-               // Don't use uniform size
-               *width = (int)( tex->width * ( (float)m_textureScale / 100 ) );
-               *height = (int)( tex->height * ( (float)m_textureScale / 100 ) );
-
-       }
-       else if ( tex->width >= tex->height ) {
-               // Texture is square, or wider than it is tall
-               if ( tex->width >= m_uniformTextureSize ){
-                       *width = m_uniformTextureSize;
-                       *height = (int)( m_uniformTextureSize * ( (float)tex->height / tex->width ) );
-               }
-               else if ( tex->width <= m_uniformTextureMinSize ){
-                       *width = m_uniformTextureMinSize;
-                       *height = (int)( m_uniformTextureMinSize * ( (float)tex->height / tex->width ) );
-               }
-               else {
-                       *width = tex->width;
-                       *height = tex->height;
-               }
-       }
-       else {
-               // Texture taller than it is wide
-               if ( tex->height >= m_uniformTextureSize ){
-                       *height = m_uniformTextureSize;
-                       *width = (int)( m_uniformTextureSize * ( (float)tex->width / tex->height ) );
-               }
-               else if ( tex->height <= m_uniformTextureMinSize ){
-                       *height = m_uniformTextureMinSize;
-                       *width = (int)( m_uniformTextureMinSize * ( (float)tex->width / tex->height ) );
-               }
-               else {
-                       *width = tex->width;
-                       *height = tex->height;
-               }
-       }
-}
-
-*/
 void getTextureWH( qtexture_t* tex, int &W, int &H ){
                // Don't use uniform size
                W = (int)( tex->width * ( (float)m_textureScale / 100 ) );
@@ -432,7 +393,8 @@ TextureBrowser() :
        m_searchedTags( false ),
        m_tags( false ),
        m_uniformTextureSize( 160 ),
-       m_uniformTextureMinSize( 48 ){
+       m_uniformTextureMinSize( 48 ),
+       m_move_started( false ){
 }
 };
 
@@ -1159,14 +1121,19 @@ void TextureBrowser_trackingDelta( int x, int y, unsigned int state, void* data
        }
 }
 
-void TextureBrowser_Tracking_MouseDown( TextureBrowser& textureBrowser ){
-       textureBrowser.m_freezePointer.freeze_pointer( textureBrowser.m_parent, TextureBrowser_trackingDelta, &textureBrowser );
-}
-
 void TextureBrowser_Tracking_MouseUp( TextureBrowser& textureBrowser ){
+       textureBrowser.m_move_started = false;
        textureBrowser.m_freezePointer.unfreeze_pointer( textureBrowser.m_parent );
 }
 
+void TextureBrowser_Tracking_MouseDown( TextureBrowser& textureBrowser ){
+       if( textureBrowser.m_move_started ){
+               TextureBrowser_Tracking_MouseUp( textureBrowser );
+       }
+       textureBrowser.m_move_started = true;
+       textureBrowser.m_freezePointer.freeze_pointer( textureBrowser.m_parent, textureBrowser.m_gl_widget, TextureBrowser_trackingDelta, &textureBrowser );
+}
+
 void TextureBrowser_Selection_MouseDown( TextureBrowser& textureBrowser, guint32 flags, int pointx, int pointy ){
        SelectTexture( textureBrowser, pointx, textureBrowser.height - 1 - pointy, ( flags & GDK_SHIFT_MASK ) != 0 );
 }

diff --git a/radiant/xywindow.cpp b/radiant/xywindow.cpp
index 9177f9fefd81b2b0405293fd987656412ad9266e..ae99174bf856d3ee5a659ca8f46d1083cb6a12cf 100644 (file)
--- a/radiant/xywindow.cpp
+++ b/radiant/xywindow.cpp
@@ -1210,7 +1210,7 @@ void XYWnd::Move_Begin(){
                Move_End();
        }
        m_move_started = true;
-       g_xywnd_freezePointer.freeze_pointer( m_parent  ? m_parent : MainFrame_getWindow(), XYWnd_moveDelta, this );
+       g_xywnd_freezePointer.freeze_pointer( m_parent  ? m_parent : MainFrame_getWindow(), m_gl_widget, XYWnd_moveDelta, this );
        m_move_focusOut = m_gl_widget.connect( "focus_out_event", G_CALLBACK( XYWnd_Move_focusOut ), this );
 }
 
@@ -1255,7 +1255,7 @@ void XYWnd::Zoom_Begin(){
        }
        m_zoom_started = true;
        g_dragZoom = 0;
-       g_xywnd_freezePointer.freeze_pointer( m_parent ? m_parent : MainFrame_getWindow(), XYWnd_zoomDelta, this );
+       g_xywnd_freezePointer.freeze_pointer( m_parent ? m_parent : MainFrame_getWindow(), m_gl_widget, XYWnd_zoomDelta, this );
        m_zoom_focusOut = m_gl_widget.connect( "focus_out_event", G_CALLBACK( XYWnd_Zoom_focusOut ), this );
 }