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
6ea1d1d3
Kaydet (Commit)
6ea1d1d3
authored
May 15, 2015
tarafından
Caolán McNamara
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
gtk3: implement NWF CTRL_MULTILINE_EDITBOX
Change-Id: I1f86e262f64951d646ce74e3ceb225774afd7d1d
üst
4fd045f8
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
2 deletions
+12
-2
gtkgdi.hxx
vcl/inc/unx/gtk/gtkgdi.hxx
+1
-0
gtk3salnativewidgets-gtk.cxx
vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
+11
-2
No files found.
vcl/inc/unx/gtk/gtkgdi.hxx
Dosyayı görüntüle @
6ea1d1d3
...
@@ -66,6 +66,7 @@ private:
...
@@ -66,6 +66,7 @@ private:
GtkWidget
*
mpWindow
;
GtkWidget
*
mpWindow
;
static
GtkStyleContext
*
mpButtonStyle
;
static
GtkStyleContext
*
mpButtonStyle
;
static
GtkStyleContext
*
mpEntryStyle
;
static
GtkStyleContext
*
mpEntryStyle
;
static
GtkStyleContext
*
mpTextViewStyle
;
static
GtkStyleContext
*
mpVScrollbarStyle
;
static
GtkStyleContext
*
mpVScrollbarStyle
;
static
GtkStyleContext
*
mpHScrollbarStyle
;
static
GtkStyleContext
*
mpHScrollbarStyle
;
static
GtkStyleContext
*
mpToolbarStyle
;
static
GtkStyleContext
*
mpToolbarStyle
;
...
...
vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
Dosyayı görüntüle @
6ea1d1d3
...
@@ -22,6 +22,7 @@
...
@@ -22,6 +22,7 @@
GtkStyleContext
*
GtkSalGraphics
::
mpButtonStyle
=
NULL
;
GtkStyleContext
*
GtkSalGraphics
::
mpButtonStyle
=
NULL
;
GtkStyleContext
*
GtkSalGraphics
::
mpEntryStyle
=
NULL
;
GtkStyleContext
*
GtkSalGraphics
::
mpEntryStyle
=
NULL
;
GtkStyleContext
*
GtkSalGraphics
::
mpTextViewStyle
=
NULL
;
GtkStyleContext
*
GtkSalGraphics
::
mpVScrollbarStyle
=
NULL
;
GtkStyleContext
*
GtkSalGraphics
::
mpVScrollbarStyle
=
NULL
;
GtkStyleContext
*
GtkSalGraphics
::
mpHScrollbarStyle
=
NULL
;
GtkStyleContext
*
GtkSalGraphics
::
mpHScrollbarStyle
=
NULL
;
GtkStyleContext
*
GtkSalGraphics
::
mpToolbarStyle
=
NULL
;
GtkStyleContext
*
GtkSalGraphics
::
mpToolbarStyle
=
NULL
;
...
@@ -840,6 +841,9 @@ bool GtkSalGraphics::drawNativeControl( ControlType nType, ControlPart nPart, co
...
@@ -840,6 +841,9 @@ bool GtkSalGraphics::drawNativeControl( ControlType nType, ControlPart nPart, co
case
CTRL_EDITBOX
:
case
CTRL_EDITBOX
:
context
=
mpEntryStyle
;
context
=
mpEntryStyle
;
break
;
break
;
case
CTRL_MULTILINE_EDITBOX
:
context
=
mpTextViewStyle
;
break
;
case
CTRL_COMBOBOX
:
case
CTRL_COMBOBOX
:
context
=
mpComboboxStyle
;
context
=
mpComboboxStyle
;
renderType
=
RENDER_COMBOBOX
;
renderType
=
RENDER_COMBOBOX
;
...
@@ -1709,9 +1713,13 @@ bool GtkSalGraphics::IsNativeControlSupported( ControlType nType, ControlPart nP
...
@@ -1709,9 +1713,13 @@ bool GtkSalGraphics::IsNativeControlSupported( ControlType nType, ControlPart nP
break
;
break
;
case
CTRL_EDITBOX
:
case
CTRL_EDITBOX
:
// case CTRL_MULTILINE_EDITBOX:
case
CTRL_MULTILINE_EDITBOX
:
if
(
nPart
==
PART_ENTIRE_CONTROL
||
nPart
==
HAS_BACKGROUND_TEXTURE
)
return
true
;
break
;
case
CTRL_COMBOBOX
:
case
CTRL_COMBOBOX
:
if
(
nPart
==
PART_ENTIRE_CONTROL
||
nPart
==
HAS_BACKGROUND_TEXTURE
||
nPart
==
PART_ALL_BUTTONS
)
if
(
nPart
==
PART_ENTIRE_CONTROL
||
nPart
==
HAS_BACKGROUND_TEXTURE
||
nPart
==
PART_ALL_BUTTONS
)
return
true
;
return
true
;
break
;
break
;
...
@@ -1886,6 +1894,7 @@ GtkSalGraphics::GtkSalGraphics( GtkSalFrame *pFrame, GtkWidget *pWindow )
...
@@ -1886,6 +1894,7 @@ GtkSalGraphics::GtkSalGraphics( GtkSalFrame *pFrame, GtkWidget *pWindow )
gEntryBox
=
gtk_entry_new
();
gEntryBox
=
gtk_entry_new
();
getStyleContext
(
&
mpEntryStyle
,
gEntryBox
);
getStyleContext
(
&
mpEntryStyle
,
gEntryBox
);
getStyleContext
(
&
mpTextViewStyle
,
gtk_text_view_new
());
getStyleContext
(
&
mpButtonStyle
,
gtk_button_new
());
getStyleContext
(
&
mpButtonStyle
,
gtk_button_new
());
getStyleContext
(
&
mpToolbarStyle
,
gtk_toolbar_new
());
getStyleContext
(
&
mpToolbarStyle
,
gtk_toolbar_new
());
...
...
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