[Libreoffice-commits] core.git: 2 commits - include/sfx2 vcl/unx

[Caolán McNamara]

 include/sfx2/sidebar/SidebarToolBox.hxx       |    1 +
 vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx |   13 ++++++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

New commits:
commit 01f2d3fed2e4d52490241a926f08e29d2bda41a4
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri May 1 17:14:06 2015 +0100

    gtk3: distinguish between first, last and only tabs
    
    Change-Id: Ic69b84a3dd94ee25d5e660da152b1e776fa2b38e

diff --git a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
index 9ee90c4..f8fcb1d 100644
--- a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
@@ -956,7 +956,18 @@ bool GtkSalGraphics::drawNativeControl( ControlType nType, ControlPart nPart, co
     gtk_style_context_set_state(context, flags);
     if (nType == CTRL_TAB_ITEM)
     {
-        gtk_style_context_add_region(mpNoteBookStyle, GTK_STYLE_REGION_TAB, GTK_REGION_EVEN);
+
+        const TabitemValue& rTabitemValue = static_cast<const TabitemValue&>(aValue);
+
+        GtkRegionFlags eFlags(GTK_REGION_EVEN);
+        if (rTabitemValue.isFirst() && rTabitemValue.isLast())
+            eFlags = GTK_REGION_ONLY;
+        else if (rTabitemValue.isFirst())
+            eFlags = GTK_REGION_FIRST;
+        else if (rTabitemValue.isLast())
+            eFlags = GTK_REGION_LAST;
+
+        gtk_style_context_add_region(mpNoteBookStyle, GTK_STYLE_REGION_TAB, eFlags);
         gtk_style_context_add_class(context, GTK_STYLE_CLASS_TOP);
     }
     if (styleClass)
commit 79acfc59aa84018827a9a68edbbb0576e65588a2
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri May 1 16:18:29 2015 +0100

    missing include
    
    Change-Id: If649c044d5dde770942cc4d859d1191612a247c7

diff --git a/include/sfx2/sidebar/SidebarToolBox.hxx b/include/sfx2/sidebar/SidebarToolBox.hxx
index a49f668..80ae7a1 100644
--- a/include/sfx2/sidebar/SidebarToolBox.hxx
+++ b/include/sfx2/sidebar/SidebarToolBox.hxx
@@ -20,6 +20,7 @@
 #define INCLUDED_SFX2_SIDEBAR_SIDEBARTOOLBOX_HXX
 
 #include <sfx2/dllapi.h>
+#include <sfx2/sidebar/SidebarToolBox.hxx>
 #include <vcl/toolbox.hxx>
 #include <com/sun/star/frame/XDispatch.hpp>
 #include <com/sun/star/frame/XFrame.hpp>