projects / mono.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
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 76b90dab41249954b61ebc5a9c88a3c479e68c88..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
@@ -154,8 +154,7 @@ namespace System.Windows.Forms {
                                int x = Control.LowOrder ((int) m.LParam.ToInt32 ());
                                int y = Control.HighOrder ((int) m.LParam.ToInt32 ());
 
-                               form.PointToClient (ref x, ref y);
-                               y += TitleBarHeight;
+                               NCPointToClient (ref x, ref y);
 
                                FormPos pos = FormPosForCoords (x, y);
                                
@@ -198,14 +197,14 @@ namespace System.Windows.Forms {
                                }
                                return true;
 
-                       case Msg.WM_NCMOUSEMOVE:
-                               return HandleNCMouseMove (form, ref m);
-
+                               // 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);
@@ -237,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;
                }
 
@@ -307,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 ();
                }
 
@@ -316,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 ()
@@ -345,13 +348,13 @@ namespace System.Windows.Forms {
                                close_button = null;
                                minimize_button = null;
                                maximize_button = null;
-                               if (IsMaximized)
+                               if (IsMaximized || IsMinimized)
                                        goto case FormBorderStyle.Sizable;
                                break;
                        case FormBorderStyle.FixedToolWindow:
                        case FormBorderStyle.SizableToolWindow:
                                close_button = new TitleButton (CaptionButton.Close, new EventHandler (CloseClicked));
-                               if (IsMaximized)
+                               if (IsMaximized || IsMinimized)
                                        goto case FormBorderStyle.Sizable;
                                break;
                        case FormBorderStyle.FixedSingle:
@@ -381,25 +384,22 @@ namespace System.Windows.Forms {
                {
                        Activate ();
 
-                       int x = Control.LowOrder ((int) m.LParam.ToInt32 ());
-                       int y = Control.HighOrder ((int) m.LParam.ToInt32 ());
-
                        start = Cursor.Position;
                        virtual_position = form.Bounds;
 
-                       form.PointToClient (ref x, ref y);
+                       int x = Control.LowOrder ((int) m.LParam.ToInt32 ());
+                       int y = Control.HighOrder ((int) m.LParam.ToInt32 ());
+                       
                        // Need to adjust because we are in NC land
-                       y += TitleBarHeight;
+                       NCPointToClient (ref x, ref y);
                        FormPos pos = FormPosForCoords (x, y);
-
+                       
                        if (pos == FormPos.TitleBar) {
                                HandleTitleBarDown (x, y);
                                return true;
                        }
 
                        if (IsSizable) {
-                               SetCursorForPos (pos);
-                       
                                if ((pos & FormPos.AnyEdge) == 0)
                                        return false;
 
@@ -460,48 +460,10 @@ namespace System.Windows.Forms {
                        return false;
                }
 
-               private bool HandleNCMouseMove (Form form, ref Message m)
-               {
-                       int x = Control.LowOrder ((int) m.LParam.ToInt32 ());
-                       int y = Control.HighOrder ((int) m.LParam.ToInt32 ());
-                       
-                       if (IsSizable) {
-                               form.PointToClient (ref x, ref y);
-                               y += TitleBarHeight;
-                       }
-
-                       return false;
-               }
-
                private void FormMouseLeave (ref Message m)
                {
                        form.ResetCursor ();
                }
-
-               private void SetCursorForPos (FormPos pos)
-               {
-                       switch (pos) {
-                       case FormPos.TopLeft:
-                       case FormPos.BottomRight:
-                               form.Cursor = Cursors.SizeNWSE;
-                               break;
-                       case FormPos.TopRight:
-                       case FormPos.BottomLeft:
-                               form.Cursor = Cursors.SizeNESW;
-                               break;
-                       case FormPos.Top:
-                       case FormPos.Bottom:
-                               form.Cursor = Cursors.SizeNS;
-                               break;
-                       case FormPos.Left:
-                       case FormPos.Right:
-                               form.Cursor = Cursors.SizeWE;
-                               break;
-                       default:
-                               form.ResetCursor ();
-                               break;
-                       }
-               }
        
                protected virtual void HandleWindowMove (Message m)
                {
@@ -553,6 +515,10 @@ namespace System.Windows.Forms {
                        get { return GetWindowState () == FormWindowState.Maximized; }
                }
 
+               public bool IsMinimized {
+                       get { return GetWindowState () == FormWindowState.Minimized; }
+               }
+
                public bool IsSizable {
                        get {
                                switch (form.FormBorderStyle) {
@@ -627,15 +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);
-
-                       // Need to adjust because we are in NC land
-                       y += TitleBarHeight;
+                       NCPointToClient (ref x, ref y);
 
                        foreach (TitleButton button in title_buttons) {
                                if (button != null && button.Rectangle.Contains (x, y)) {
@@ -706,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);
my mono mirror. check out Moved to http://github.com/mono/mono