← Back to branch summary

~ubuntu-branches/ubuntu/wily/monodevelop/wily

« back to all changes in this revision

Viewing changes to src/core/MonoDevelop.Components/MonoDevelop.Components.DockToolbars/DockToolbarPanel.cs

  • Committer: Bazaar Package Importer
  • Author(s): Jo Shields
  • Date: 2010-02-02 11:39:59 UTC
  • mfrom: (10.2.4 upstream)
  • Revision ID: james.westby@ubuntu.com-20100202113959-n3u848nfj35yyd03
Tags: 2.2.1+dfsg-1
* New upstream release
* debian/control:
  + Standards version 3.8.4 (no changes needed)
* debian/patches/remove_support_for_non_debian_functionality.patch,
  debian/patches/remove_support_for_soft_debugger.patch,
  debian/patches/remove_support_for_moonlight.patch,
  debian/rules:
  + Split patch into two pieces, to make it easier to enable either
    SDB or Moonlight support with a rebuild
* debian/monodevelop-moonlight.install,
  debian/monodevelop-debugger-sdb.install,
  debian/control:
  + Create packaging data for the Soft Debugger addin and Moonlight addin -
    and comment them out of debian/control as we can't provide them on
    Debian for now

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/core/MonoDevelop.Components/MonoDevelop.Components.DockToolbars/DockToolbarPanel.cs
790
790
                        return t;
791
791
                }
792
792
                
 
793
                int MaxRow {
 
794
                        get {
 
795
                                var lastBar = (DockToolbar)bars[bars.Count -1];
 
796
                                return lastBar.DockRow;
 
797
                        }
 
798
                }
 
799
                
793
800
                void SortBars ()
794
801
                {
795
802
                        bars.Sort (DocBarComparer.Instance);
827
834
                        // get a proper GTK+ toolbar style by using one of the children, i.e. a DockToolbar, a subclass of GtkToolbar
828
835
                        var styleProvider = (Widget)bars[0];
829
836
                        var shadowType = (ShadowType) styleProvider.StyleGetProperty ("shadow-type");
830
 
                        Style.PaintBox (styleProvider.Style, evnt.Window, State, shadowType, evnt.Area, styleProvider, "toolbar", 
831
 
                                        Allocation.X, Allocation.Y, Allocation.Width, Allocation.Height);
 
837
                        
 
838
                        //render each row separately, so the theme treats each as a row, and they match the individual toolbars' themed painting
 
839
                        //FIXME: Mac only seems to display the last-painted row, even though we make paint calls for all of them
 
840
                        int row = MaxRow;
 
841
                        for (int i = bars.Count - 1; i >= 0; i--) {
 
842
                                var bar = (DockToolbar) bars[i];
 
843
                                if (bar.DockRow == row) {
 
844
                                        row--;
 
845
                                        Style.PaintBox (bar.Style, evnt.Window, State, shadowType, evnt.Area, bar, "toolbar", 
 
846
                                                        Allocation.X, bar.Allocation.Y, Allocation.Width, bar.Allocation.Height);
 
847
                                }
 
848
                        }
 
849
                        
832
850
                        foreach (DockToolbar bar in bars)
833
851
                                this.PropagateExpose (bar, evnt);
834
852
                        return true;