Fixed tabs/spaces indentation mistake.

[mono.git] / mcs / class / Managed.Windows.Forms / System.Windows.Forms / InternalWindowManager.cs

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/InternalWindowManager.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/InternalWindowManager.cs
index ae87a61f15c8548823461b0a34922102abfcf66a..5acda6776cdb752c6bc119faeacca08f1530c0b2 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/InternalWindowManager.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/InternalWindowManager.cs
@@ -153,8 +153,8 @@ namespace System.Windows.Forms {
                        case Msg.WM_NCHITTEST:
                                int x = Control.LowOrder ((int) m.LParam.ToInt32 ());
                                int y = Control.HighOrder ((int) m.LParam.ToInt32 ());
-                               
-                               form.PointToClient (ref x, ref y);
+
+                               NCPointToClient (ref x, ref y);
 
                                FormPos pos = FormPosForCoords (x, y);
                                
@@ -197,11 +197,14 @@ namespace System.Windows.Forms {
                                }
                                return true;
 
+                               // Return true from these guys, otherwise win32 will mess up z-order
                        case Msg.WM_NCLBUTTONUP:
-                               return HandleNCLButtonUp (ref m);
+                               HandleNCLButtonUp (ref m);
+                               return true;
 
                        case Msg.WM_NCLBUTTONDOWN:
-                               return HandleNCLButtonDown (ref m);
+                               HandleNCLButtonDown (ref m);
+                               return true;
 
                        case Msg.WM_NCLBUTTONDBLCLK:
                                HandleNCLButtonDblClick (ref m);
@@ -233,9 +236,23 @@ namespace System.Windows.Forms {
                                break;
 
                        case Msg.WM_NCPAINT:
-                               PaintDecorations ();
+                               PaintEventArgs pe = XplatUI.PaintEventStart (form.Handle, false);
+
+                               Rectangle clip;
+                               // clip region is not correct on win32.
+                               // if (m.WParam.ToInt32 () > 1) {
+                               //      Region r = Region.FromHrgn (m.WParam);
+                               //      RectangleF rf = r.GetBounds (pe.Graphics);
+                               //      clip = new Rectangle ((int) rf.X, (int) rf.Y, (int) rf.Width, (int) rf.Height);
+                               //} else {      
+                               clip = new Rectangle (0, 0, form.Width, form.Height);
+                               //}
+
+                               ThemeEngine.Current.DrawManagedWindowDecorations (pe.Graphics, clip, this);
+                               XplatUI.PaintEventEnd (form.Handle, false);
                                return true;
                        }
+
                        return false;
                }
 
@@ -303,7 +320,7 @@ namespace System.Windows.Forms {
                protected virtual void Activate ()
                {
                        // Hack to get a paint
-                       NativeWindow.WndProc (form.Handle, Msg.WM_NCPAINT, IntPtr.Zero, IntPtr.Zero);
+                       //NativeWindow.WndProc (form.Handle, Msg.WM_NCPAINT, IntPtr.Zero, IntPtr.Zero);
                        form.Refresh ();
                }
 
@@ -312,26 +329,16 @@ namespace System.Windows.Forms {
                        return true;
                }
 
+
                private void FormSizeChangedHandler (object sender, EventArgs e)
                {
                        ThemeEngine.Current.ManagedWindowSetButtonLocations (this);
-
-                       PaintDecorations ();
-               }
-
-               public void PaintDecorations ()
-               {
-                       PaintEventArgs pe = XplatUI.PaintEventStart (form.Handle, false);
-                       ThemeEngine.Current.DrawManagedWindowDecorations (pe.Graphics, pe.ClipRectangle, this);
-
-                       if (IsMaximized) {
-                               MainMenu menu = form.ActiveMenu;
-                               DrawMaximizedButtons (menu, pe);
-                               if (menu != null)
-                                       menu.Draw (pe);
-                       }
-
-                       XplatUI.PaintEventEnd (form.Handle, false);
+                       Message m = new Message ();
+                       m.Msg = (int) Msg.WM_NCPAINT;
+                       m.HWnd = form.Handle;
+                       m.LParam = IntPtr.Zero;
+                       m.WParam = new IntPtr (1);
+                       XplatUI.SendMessage (ref m);
                }
 
                protected void CreateButtons ()
@@ -382,12 +389,10 @@ namespace System.Windows.Forms {
 
                        int x = Control.LowOrder ((int) m.LParam.ToInt32 ());
                        int y = Control.HighOrder ((int) m.LParam.ToInt32 ());
-                       Console.WriteLine ("MOUSE DOWN:   ({0}, {1})", x, y);
                        
-                       form.PointToClient (ref x, ref y);
                        // Need to adjust because we are in NC land
+                       NCPointToClient (ref x, ref y);
                        FormPos pos = FormPosForCoords (x, y);
-
                        
                        if (pos == FormPos.TitleBar) {
                                HandleTitleBarDown (x, y);
@@ -415,7 +420,6 @@ namespace System.Windows.Forms {
                protected virtual void HandleTitleBarDown (int x, int y)
                {
                        foreach (TitleButton button in title_buttons) {
-                               Console.WriteLine ("BUTTON RECTANGLE:     {0}", button.Rectangle);
                                if (button != null && button.Rectangle.Contains (x, y)) {
                                        button.State = ButtonState.Pushed;
                                        return;
@@ -589,12 +593,14 @@ namespace System.Windows.Forms {
 
                                form.Capture = false;
                                state = State.Idle;
+                               if (form.MdiContainer != null)
+                                       form.MdiContainer.SizeScrollBars();
                        }
                                
                        int x = Control.LowOrder ((int) m.LParam.ToInt32 ());
                        int y = Control.HighOrder ((int) m.LParam.ToInt32 ());
 
-                       form.PointToClient (ref x, ref y);
+                       NCPointToClient (ref x, ref y);
 
                        foreach (TitleButton button in title_buttons) {
                                if (button != null && button.Rectangle.Contains (x, y)) {
@@ -665,6 +671,12 @@ namespace System.Windows.Forms {
                {
                }
 
+               protected virtual void NCPointToClient(ref int x, ref int y) {
+                       form.PointToClient(ref x, ref y);
+                       y += TitleBarHeight;
+                       y += ThemeEngine.Current.ManagedWindowBorderWidth (this);
+               }
+
                protected FormPos FormPosForCoords (int x, int y)
                {
                        int bw = ThemeEngine.Current.ManagedWindowBorderWidth (this);