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
02b1e147
Kaydet (Commit)
02b1e147
authored
Haz 30, 2015
tarafından
Caolán McNamara
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
gtk3: listen to state-flags-changed and disable toplevels when in backdrop
Change-Id: I173618b2e6a2ad69918da8b85ec0eef7099f1d3d
üst
203e3c0f
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
23 additions
and
3 deletions
+23
-3
gtkframe.hxx
vcl/inc/unx/gtk/gtkframe.hxx
+2
-1
gtksalframe.cxx
vcl/unx/gtk/window/gtksalframe.cxx
+21
-2
No files found.
vcl/inc/unx/gtk/gtkframe.hxx
Dosyayı görüntüle @
02b1e147
...
@@ -238,6 +238,7 @@ class GtkSalFrame : public SalFrame, public X11WindowProvider
...
@@ -238,6 +238,7 @@ class GtkSalFrame : public SalFrame, public X11WindowProvider
static
void
signalStyleSet
(
GtkWidget
*
,
GtkStyle
*
pPrevious
,
gpointer
);
static
void
signalStyleSet
(
GtkWidget
*
,
GtkStyle
*
pPrevious
,
gpointer
);
#if GTK_CHECK_VERSION(3,0,0)
#if GTK_CHECK_VERSION(3,0,0)
static
gboolean
signalDraw
(
GtkWidget
*
,
cairo_t
*
cr
,
gpointer
);
static
gboolean
signalDraw
(
GtkWidget
*
,
cairo_t
*
cr
,
gpointer
);
static
void
signalFlagsChanged
(
GtkWidget
*
,
GtkStateFlags
,
gpointer
);
#if GTK_CHECK_VERSION(3,14,0)
#if GTK_CHECK_VERSION(3,14,0)
static
void
gestureSwipe
(
GtkGestureSwipe
*
gesture
,
gdouble
velocity_x
,
gdouble
velocity_y
,
gpointer
frame
);
static
void
gestureSwipe
(
GtkGestureSwipe
*
gesture
,
gdouble
velocity_x
,
gdouble
velocity_y
,
gpointer
frame
);
static
void
gestureLongPress
(
GtkGestureLongPress
*
gesture
,
gpointer
frame
);
static
void
gestureLongPress
(
GtkGestureLongPress
*
gesture
,
gpointer
frame
);
...
@@ -252,7 +253,7 @@ class GtkSalFrame : public SalFrame, public X11WindowProvider
...
@@ -252,7 +253,7 @@ class GtkSalFrame : public SalFrame, public X11WindowProvider
static
gboolean
signalMotion
(
GtkWidget
*
,
GdkEventMotion
*
,
gpointer
);
static
gboolean
signalMotion
(
GtkWidget
*
,
GdkEventMotion
*
,
gpointer
);
static
gboolean
signalKey
(
GtkWidget
*
,
GdkEventKey
*
,
gpointer
);
static
gboolean
signalKey
(
GtkWidget
*
,
GdkEventKey
*
,
gpointer
);
static
gboolean
signalDelete
(
GtkWidget
*
,
GdkEvent
*
,
gpointer
);
static
gboolean
signalDelete
(
GtkWidget
*
,
GdkEvent
*
,
gpointer
);
static
gboolean
signalState
(
GtkWidget
*
,
GdkEvent
*
,
gpointer
);
static
gboolean
signal
Window
State
(
GtkWidget
*
,
GdkEvent
*
,
gpointer
);
static
gboolean
signalScroll
(
GtkWidget
*
,
GdkEvent
*
,
gpointer
);
static
gboolean
signalScroll
(
GtkWidget
*
,
GdkEvent
*
,
gpointer
);
static
gboolean
signalCrossing
(
GtkWidget
*
,
GdkEventCrossing
*
,
gpointer
);
static
gboolean
signalCrossing
(
GtkWidget
*
,
GdkEventCrossing
*
,
gpointer
);
static
gboolean
signalVisibility
(
GtkWidget
*
,
GdkEventVisibility
*
,
gpointer
);
static
gboolean
signalVisibility
(
GtkWidget
*
,
GdkEventVisibility
*
,
gpointer
);
...
...
vcl/unx/gtk/window/gtksalframe.cxx
Dosyayı görüntüle @
02b1e147
...
@@ -1035,6 +1035,7 @@ void GtkSalFrame::InitCommon()
...
@@ -1035,6 +1035,7 @@ void GtkSalFrame::InitCommon()
g_signal_connect
(
G_OBJECT
(
m_pWindow
),
"button-release-event"
,
G_CALLBACK
(
signalButton
),
this
);
g_signal_connect
(
G_OBJECT
(
m_pWindow
),
"button-release-event"
,
G_CALLBACK
(
signalButton
),
this
);
#if GTK_CHECK_VERSION(3,0,0)
#if GTK_CHECK_VERSION(3,0,0)
g_signal_connect
(
G_OBJECT
(
m_pWindow
),
"draw"
,
G_CALLBACK
(
signalDraw
),
this
);
g_signal_connect
(
G_OBJECT
(
m_pWindow
),
"draw"
,
G_CALLBACK
(
signalDraw
),
this
);
g_signal_connect
(
G_OBJECT
(
m_pWindow
),
"state-flags-changed"
,
G_CALLBACK
(
signalFlagsChanged
),
this
);
#if GTK_CHECK_VERSION(3,14,0)
#if GTK_CHECK_VERSION(3,14,0)
GtkGesture
*
pSwipe
=
gtk_gesture_swipe_new
(
m_pWindow
);
GtkGesture
*
pSwipe
=
gtk_gesture_swipe_new
(
m_pWindow
);
g_signal_connect
(
pSwipe
,
"swipe"
,
G_CALLBACK
(
gestureSwipe
),
this
);
g_signal_connect
(
pSwipe
,
"swipe"
,
G_CALLBACK
(
gestureSwipe
),
this
);
...
@@ -1060,7 +1061,7 @@ void GtkSalFrame::InitCommon()
...
@@ -1060,7 +1061,7 @@ void GtkSalFrame::InitCommon()
g_signal_connect
(
G_OBJECT
(
m_pWindow
),
"key-press-event"
,
G_CALLBACK
(
signalKey
),
this
);
g_signal_connect
(
G_OBJECT
(
m_pWindow
),
"key-press-event"
,
G_CALLBACK
(
signalKey
),
this
);
g_signal_connect
(
G_OBJECT
(
m_pWindow
),
"key-release-event"
,
G_CALLBACK
(
signalKey
),
this
);
g_signal_connect
(
G_OBJECT
(
m_pWindow
),
"key-release-event"
,
G_CALLBACK
(
signalKey
),
this
);
g_signal_connect
(
G_OBJECT
(
m_pWindow
),
"delete-event"
,
G_CALLBACK
(
signalDelete
),
this
);
g_signal_connect
(
G_OBJECT
(
m_pWindow
),
"delete-event"
,
G_CALLBACK
(
signalDelete
),
this
);
g_signal_connect
(
G_OBJECT
(
m_pWindow
),
"window-state-event"
,
G_CALLBACK
(
signalState
),
this
);
g_signal_connect
(
G_OBJECT
(
m_pWindow
),
"window-state-event"
,
G_CALLBACK
(
signal
Window
State
),
this
);
g_signal_connect
(
G_OBJECT
(
m_pWindow
),
"scroll-event"
,
G_CALLBACK
(
signalScroll
),
this
);
g_signal_connect
(
G_OBJECT
(
m_pWindow
),
"scroll-event"
,
G_CALLBACK
(
signalScroll
),
this
);
g_signal_connect
(
G_OBJECT
(
m_pWindow
),
"leave-notify-event"
,
G_CALLBACK
(
signalCrossing
),
this
);
g_signal_connect
(
G_OBJECT
(
m_pWindow
),
"leave-notify-event"
,
G_CALLBACK
(
signalCrossing
),
this
);
g_signal_connect
(
G_OBJECT
(
m_pWindow
),
"enter-notify-event"
,
G_CALLBACK
(
signalCrossing
),
this
);
g_signal_connect
(
G_OBJECT
(
m_pWindow
),
"enter-notify-event"
,
G_CALLBACK
(
signalCrossing
),
this
);
...
@@ -3442,6 +3443,24 @@ gboolean GtkSalFrame::signalButton( GtkWidget*, GdkEventButton* pEvent, gpointer
...
@@ -3442,6 +3443,24 @@ gboolean GtkSalFrame::signalButton( GtkWidget*, GdkEventButton* pEvent, gpointer
return
true
;
return
true
;
}
}
#if GTK_CHECK_VERSION(3,0,0)
void
GtkSalFrame
::
signalFlagsChanged
(
GtkWidget
*
,
GtkStateFlags
state
,
gpointer
frame
)
{
GtkSalFrame
*
pThis
=
static_cast
<
GtkSalFrame
*>
(
frame
);
bool
bOldBackDrop
=
state
&
GTK_STATE_FLAG_BACKDROP
;
bool
bNewBackDrop
=
(
gtk_widget_get_state_flags
(
GTK_WIDGET
(
pThis
->
m_pWindow
))
&
GTK_STATE_FLAG_BACKDROP
);
if
(
bNewBackDrop
&&
!
bOldBackDrop
)
{
pThis
->
GetWindow
()
->
Disable
();
}
else
if
(
bOldBackDrop
&&
!
bNewBackDrop
)
{
pThis
->
GetWindow
()
->
Enable
();
}
}
#endif
gboolean
GtkSalFrame
::
signalScroll
(
GtkWidget
*
,
GdkEvent
*
pEvent
,
gpointer
frame
)
gboolean
GtkSalFrame
::
signalScroll
(
GtkWidget
*
,
GdkEvent
*
pEvent
,
gpointer
frame
)
{
{
GtkSalFrame
*
pThis
=
static_cast
<
GtkSalFrame
*>
(
frame
);
GtkSalFrame
*
pThis
=
static_cast
<
GtkSalFrame
*>
(
frame
);
...
@@ -4047,7 +4066,7 @@ void GtkSalFrame::signalStyleSet( GtkWidget*, GtkStyle* pPrevious, gpointer fram
...
@@ -4047,7 +4066,7 @@ void GtkSalFrame::signalStyleSet( GtkWidget*, GtkStyle* pPrevious, gpointer fram
#endif
#endif
}
}
gboolean
GtkSalFrame
::
signalState
(
GtkWidget
*
,
GdkEvent
*
pEvent
,
gpointer
frame
)
gboolean
GtkSalFrame
::
signal
Window
State
(
GtkWidget
*
,
GdkEvent
*
pEvent
,
gpointer
frame
)
{
{
GtkSalFrame
*
pThis
=
static_cast
<
GtkSalFrame
*>
(
frame
);
GtkSalFrame
*
pThis
=
static_cast
<
GtkSalFrame
*>
(
frame
);
if
(
(
pThis
->
m_nState
&
GDK_WINDOW_STATE_ICONIFIED
)
!=
(
pEvent
->
window_state
.
new_window_state
&
GDK_WINDOW_STATE_ICONIFIED
)
)
if
(
(
pThis
->
m_nState
&
GDK_WINDOW_STATE_ICONIFIED
)
!=
(
pEvent
->
window_state
.
new_window_state
&
GDK_WINDOW_STATE_ICONIFIED
)
)
...
...
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