← Back to branch summary

~ubuntu-branches/ubuntu/trusty/monodevelop/trusty-proposed

« back to all changes in this revision

Viewing changes to src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/AutoHideBox.cs

  • Committer: Package Import Robot
  • Author(s): Jo Shields
  • Date: 2013-05-12 09:46:03 UTC
  • mto: This revision was merged to the branch mainline in revision 29.
  • Revision ID: package-import@ubuntu.com-20130512094603-mad323bzcxvmcam0
Tags: upstream-4.0.5+dfsg
Import upstream version 4.0.5+dfsg

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/AutoHideBox.cs
73
73
                        Box fr;
74
74
                        CustomFrame cframe = new CustomFrame ();
75
75
                        switch (pos) {
76
 
                                case PositionType.Left: cframe.SetMargins (1, 1, 0, 1); break;
77
 
                                case PositionType.Right: cframe.SetMargins (1, 1, 1, 0); break;
78
 
                                case PositionType.Top: cframe.SetMargins (0, 1, 1, 1); break;
79
 
                                case PositionType.Bottom: cframe.SetMargins (1, 0, 1, 1); break;
 
76
                                case PositionType.Left: cframe.SetMargins (0, 0, 1, 1); break;
 
77
                                case PositionType.Right: cframe.SetMargins (0, 0, 1, 1); break;
 
78
                                case PositionType.Top: cframe.SetMargins (1, 1, 0, 0); break;
 
79
                                case PositionType.Bottom: cframe.SetMargins (1, 1, 0, 0); break;
80
80
                        }
81
81
                        EventBox sepBox = new EventBox ();
82
82
                        cframe.Add (sepBox);
107
107
                        scrollable.ScrollMode = false;
108
108
                        scrollable.Show ();
109
109
#endif
110
 
 
111
 
                        if (item.Widget.Parent != null) {
112
 
                                ((Gtk.Container)item.Widget.Parent).Remove (item.Widget);
113
 
                        }
 
110
                        VBox itemBox = new VBox ();
 
111
                        itemBox.Show ();
 
112
                        item.TitleTab.Active = true;
 
113
                        itemBox.PackStart (item.TitleTab, false, false, 0);
 
114
                        itemBox.PackStart (item.Widget, true, true, 0);
114
115
 
115
116
                        item.Widget.Show ();
116
117
#if ANIMATE_DOCKING
117
 
                        scrollable.Add (item.Widget);
 
118
                        scrollable.Add (itemBox);
118
119
                        fr.PackStart (scrollable, true, true, 0);
119
120
#else
120
 
                        fr.PackStart (item.Widget, true, true, 0);
 
121
                        fr.PackStart (itemBox, true, true, 0);
121
122
#endif
122
123
                        
123
124
                        sepBox.ButtonPressEvent += OnSizeButtonPress;
267
268
                        animating = false;
268
269
                }
269
270
 
 
271
                protected override bool OnButtonPressEvent (EventButton evnt)
 
272
                {
 
273
                        // Don't propagate the button press event to the parent frame,
 
274
                        // since it has a handler that hides all visible autohide pads
 
275
                        return true;
 
276
                }
270
277
                
271
278
                public int Size {
272
279
                        get {