diff options
| author | Ruslan Kabatsayev <b7.10110111@gmail.com> | 2012-07-16 01:33:02 +0400 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-07-16 09:29:03 +0200 |
| commit | 720e2906921ed10d9d8ec62a0121813fac9c622a (patch) | |
| tree | 994b1b9f92ce515552db517957837d404989b345 /vcl | |
| parent | 8b8e611e9e17d55c49209f02f70c4a0acd2e0448 (diff) | |
Revert "Make bottom tabbar items follow native theme"
This reverts commit 17ea32a1a36d81a0a12df12adbe15e8eaf1c7c62.
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/inc/vcl/salnativewidgets.hxx | 5 | ||||
| -rw-r--r-- | vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx | 6 |
2 files changed, 1 insertions, 10 deletions
diff --git a/vcl/inc/vcl/salnativewidgets.hxx b/vcl/inc/vcl/salnativewidgets.hxx index 2ae9473766a8..40d4fbde371a 100644 --- a/vcl/inc/vcl/salnativewidgets.hxx +++ b/vcl/inc/vcl/salnativewidgets.hxx @@ -366,20 +366,16 @@ class VCL_DLLPUBLIC SliderValue : public ImplControlValue #define TABITEM_RIGHTALIGNED 0x002 // the tabitem is aligned with the right border of the TabControl #define TABITEM_FIRST_IN_GROUP 0x004 // the tabitem is the first in group of tabitems #define TABITEM_LAST_IN_GROUP 0x008 // the tabitem is the last in group of tabitems -/* This constant is independent from the ones above */ -#define TABITEM_IS_AT_BOTTOM 0x001 // the tabitem at the bottom of the TabControl class VCL_DLLPUBLIC TabitemValue : public ImplControlValue { public: unsigned int mnAlignment; - unsigned int mnPosition; inline TabitemValue() : ImplControlValue( CTRL_TAB_ITEM, BUTTONVALUE_DONTKNOW, 0 ) { mnAlignment = 0; - mnPosition = 0; }; virtual ~TabitemValue(); virtual TabitemValue* clone() const; @@ -390,7 +386,6 @@ class VCL_DLLPUBLIC TabitemValue : public ImplControlValue sal_Bool isNotAligned() const { return (mnAlignment & (TABITEM_LEFTALIGNED | TABITEM_RIGHTALIGNED)) == 0; } sal_Bool isFirst() const { return (mnAlignment & TABITEM_FIRST_IN_GROUP) != 0; } sal_Bool isLast() const { return (mnAlignment & TABITEM_LAST_IN_GROUP) != 0; } - sal_Bool isAtBottom() const { return (mnPosition & TABITEM_IS_AT_BOTTOM) != 0; } }; /* SpinbuttonValue: diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx index 6b18e7a3ae12..c9b1c30ff9ea 100644 --- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx +++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx @@ -2680,11 +2680,7 @@ sal_Bool GtkSalGraphics::NWPaintGTKTabItem( ControlType nType, ControlPart, case CTRL_TAB_ITEM: { - const TabitemValue* tiValue = static_cast<const TabitemValue *>(&aValue); stateType = ( nState & CTRL_STATE_SELECTED ) ? GTK_STATE_NORMAL : GTK_STATE_ACTIVE; - GtkPositionType gapSide(GTK_POS_BOTTOM); - if(tiValue->isAtBottom()) - gapSide=GTK_POS_TOP; // First draw the background gtk_paint_flat_box(gWidgetData[m_nXScreen].gNotebookWidget->style, pixmap, @@ -2700,7 +2696,7 @@ sal_Bool GtkSalGraphics::NWPaintGTKTabItem( ControlType nType, ControlPart, gtk_paint_extension( gWidgetData[m_nXScreen].gNotebookWidget->style, pixmap, stateType, GTK_SHADOW_OUT, NULL, gWidgetData[m_nXScreen].gNotebookWidget, (char *)"tab", (tabRect.Left() - pixmapRect.Left()), (tabRect.Top() - pixmapRect.Top()), - tabRect.GetWidth(), tabRect.GetHeight(), gapSide); + tabRect.GetWidth(), tabRect.GetHeight(), GTK_POS_BOTTOM ); g_object_steal_data(G_OBJECT(pixmap),tabPrelitDataName); |