Merge branch 'NateEag-master-patch-12920' into 'master'

[xonotic/netradiant.git] / radiant / xywindow.h

diff --git a/radiant/xywindow.h b/radiant/xywindow.h
index 36a5f1cb786258cf6f4999ebfe918b9ca9131487..e23b4bd79280f24332ef74993cb0bbda61e205a4 100644 (file)
--- a/radiant/xywindow.h
+++ b/radiant/xywindow.h
@@ -119,7 +119,7 @@ void Move_End();
 bool m_move_started;
 guint m_move_focusOut;
 
-void Zoom_Begin();
+void Zoom_Begin( int x, int y );
 void Zoom_End();
 bool m_zoom_started;
 guint m_zoom_focusOut;
@@ -127,6 +127,7 @@ guint m_zoom_focusOut;
 void ZoomIn();
 void ZoomOut();
 void ZoomInWithMouse( int pointx, int pointy );
+void FocusOnBounds( AABB& bounds );
 
 void Redraw();
 
@@ -213,10 +214,12 @@ bool m_entityCreate;
 
 public:
 void ButtonState_onMouseDown( unsigned int buttons ){
-       m_buttonstate |= buttons;
+       //m_buttonstate |= buttons;
+       m_buttonstate = buttons;
 }
 void ButtonState_onMouseUp( unsigned int buttons ){
-       m_buttonstate &= ~buttons;
+       //m_buttonstate &= ~buttons;
+       m_buttonstate = 0;
 }
 unsigned int getButtonState() const {
        return m_buttonstate;
@@ -250,6 +253,7 @@ inline void XYWnd_Update( XYWnd& xywnd ){
        xywnd.queueDraw();
 }
 
+void XY_Centralize();
 
 struct xywindow_globals_t
 {
@@ -268,9 +272,9 @@ struct xywindow_globals_t
        Vector3 AxisColorY;
        Vector3 AxisColorZ;
 
-       bool m_bRightClick;
+//     bool m_bRightClick;
        bool m_bNoStipple;
-       bool m_bImprovedWheelZoom;
+       bool m_bZoomInToPointer;
 
        xywindow_globals_t() :
                color_gridback( 0.77f, 0.77f, 0.77f ),
@@ -288,9 +292,9 @@ struct xywindow_globals_t
                AxisColorX( 1.f, 0.f, 0.f ),
                AxisColorY( 0.f, 1.f, 0.f ),
                AxisColorZ( 0.f, 0.f, 1.f ),
-               m_bRightClick( true ),
+//             m_bRightClick( true ),
                m_bNoStipple( true ),
-               m_bImprovedWheelZoom( true ){
+               m_bZoomInToPointer( true ){
        }
 
 };