Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
C
core
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
LibreOffice
core
Commits
cb1fda08
Kaydet (Commit)
cb1fda08
authored
Nis 27, 2015
tarafından
Caolán McNamara
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
gtk3: render vertical toolbar seperators
Change-Id: I6c4e5291b24015087b3ac56e2e178dbf42bf193f
üst
4679d6b9
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
23 additions
and
9 deletions
+23
-9
gtkgdi.hxx
vcl/inc/unx/gtk/gtkgdi.hxx
+1
-0
gtk3salnativewidgets-gtk.cxx
vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
+22
-9
No files found.
vcl/inc/unx/gtk/gtkgdi.hxx
Dosyayı görüntüle @
cb1fda08
...
...
@@ -70,6 +70,7 @@ private:
static
GtkStyleContext
*
mpHScrollbarStyle
;
static
GtkStyleContext
*
mpToolbarStyle
;
static
GtkStyleContext
*
mpToolButtonStyle
;
static
GtkStyleContext
*
mpToolbarSeperatorStyle
;
static
GtkStyleContext
*
mpCheckButtonStyle
;
static
GtkStyleContext
*
mpMenuBarStyle
;
static
GtkStyleContext
*
mpMenuStyle
;
...
...
vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
Dosyayı görüntüle @
cb1fda08
...
...
@@ -25,6 +25,7 @@ GtkStyleContext* GtkSalGraphics::mpVScrollbarStyle = NULL;
GtkStyleContext
*
GtkSalGraphics
::
mpHScrollbarStyle
=
NULL
;
GtkStyleContext
*
GtkSalGraphics
::
mpToolbarStyle
=
NULL
;
GtkStyleContext
*
GtkSalGraphics
::
mpToolButtonStyle
=
NULL
;
GtkStyleContext
*
GtkSalGraphics
::
mpToolbarSeperatorStyle
=
NULL
;
GtkStyleContext
*
GtkSalGraphics
::
mpCheckButtonStyle
=
NULL
;
GtkStyleContext
*
GtkSalGraphics
::
mpMenuBarStyle
=
NULL
;
GtkStyleContext
*
GtkSalGraphics
::
mpMenuStyle
=
NULL
;
...
...
@@ -66,12 +67,13 @@ enum {
RENDER_BACKGROUND_AND_FRAME
=
1
,
RENDER_CHECK
=
2
,
RENDER_BACKGROUND
=
3
,
RENDER_LINE
=
4
,
RENDER_ARROW
=
5
,
RENDER_RADIO
=
6
,
RENDER_SCROLLBAR
=
7
,
RENDER_SPINBUTTON
=
8
,
RENDER_COMBOBOX
=
9
,
RENDER_MENU_SEPERATOR
=
4
,
RENDER_TOOLBAR_SEPERATOR
=
5
,
RENDER_ARROW
=
6
,
RENDER_RADIO
=
7
,
RENDER_SCROLLBAR
=
8
,
RENDER_SPINBUTTON
=
9
,
RENDER_COMBOBOX
=
10
,
};
static
void
PrepareComboboxStyle
(
GtkStyleContext
*
context
,
...
...
@@ -861,7 +863,7 @@ bool GtkSalGraphics::drawNativeControl( ControlType nType, ControlPart nPart, co
case
PART_MENU_SEPARATOR
:
styleClass
=
GTK_STYLE_CLASS_SEPARATOR
;
context
=
mpMenuItemStyle
;
renderType
=
RENDER_
LINE
;
renderType
=
RENDER_
MENU_SEPERATOR
;
break
;
case
PART_MENU_SUBMENU_ARROW
:
context
=
mpMenuStyle
;
...
...
@@ -885,6 +887,10 @@ bool GtkSalGraphics::drawNativeControl( ControlType nType, ControlPart nPart, co
(
(
aValue
.
getTristateVal
()
==
BUTTONVALUE_ON
)
?
GTK_STATE_FLAG_ACTIVE
:
GTK_STATE_FLAG_NORMAL
));
context
=
mpToolButtonStyle
;
break
;
case
PART_SEPARATOR_VERT
:
context
=
mpToolbarSeperatorStyle
;
renderType
=
RENDER_TOOLBAR_SEPERATOR
;
break
;
default
:
return
false
;
}
...
...
@@ -948,11 +954,16 @@ bool GtkSalGraphics::drawNativeControl( ControlType nType, ControlPart nPart, co
case
RENDER_RADIO
:
PaintCheckOrRadio
(
context
,
cr
,
rControlRegion
,
nType
);
break
;
case
RENDER_
LINE
:
case
RENDER_
MENU_SEPERATOR
:
gtk_render_line
(
context
,
cr
,
3
,
rControlRegion
.
GetHeight
()
/
2
,
rControlRegion
.
GetWidth
()
-
3
,
rControlRegion
.
GetHeight
()
/
2
);
break
;
case
RENDER_TOOLBAR_SEPERATOR
:
gtk_render_line
(
context
,
cr
,
rControlRegion
.
GetWidth
()
/
2
,
3
,
rControlRegion
.
GetWidth
()
/
2
,
rControlRegion
.
GetHeight
()
-
3
);
break
;
case
RENDER_ARROW
:
gtk_render_arrow
(
context
,
cr
,
G_PI
/
2
,
0
,
0
,
...
...
@@ -1515,7 +1526,7 @@ bool GtkSalGraphics::IsNativeControlSupported( ControlType nType, ControlPart nP
// || nPart==PART_THUMB_VERT
||
nPart
==
PART_BUTTON
// || nPart==PART_SEPARATOR_HORZ
//
|| nPart==PART_SEPARATOR_VERT
||
nPart
==
PART_SEPARATOR_VERT
)
return
true
;
break
;
...
...
@@ -1634,6 +1645,8 @@ GtkSalGraphics::GtkSalGraphics( GtkSalFrame *pFrame, GtkWidget *pWindow )
gtk_style_context_add_class
(
mpToolbarStyle
,
GTK_STYLE_CLASS_PRIMARY_TOOLBAR
);
gtk_style_context_add_class
(
mpToolbarStyle
,
GTK_STYLE_CLASS_TOOLBAR
);
getStyleContext
(
&
mpToolbarSeperatorStyle
,
GTK_WIDGET
(
gtk_separator_tool_item_new
()));
getStyleContext
(
&
mpToolButtonStyle
,
gtk_button_new
());
/* Create a widget path for our toolbutton widget */
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment