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
7c45a570
Kaydet (Commit)
7c45a570
authored
Tem 26, 2015
tarafından
Pranav Kant
Kaydeden (comit)
Miklos Vajna
Tem 28, 2015
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
lokdocview: setGraphicSelection in another thread
Change-Id: Ib7a6bf63ee6f300c6c5d50d02a3465d0a075a5be
üst
de9224bf
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
70 additions
and
8 deletions
+70
-8
lokdocview.cxx
libreofficekit/source/gtk/lokdocview.cxx
+61
-7
tilebuffer.hxx
libreofficekit/source/gtk/tilebuffer.hxx
+9
-1
No files found.
libreofficekit/source/gtk/lokdocview.cxx
Dosyayı görüntüle @
7c45a570
...
...
@@ -889,7 +889,17 @@ lok_doc_view_signal_button(GtkWidget* pWidget, GdkEventButton* pEvent)
{
g_info
(
"LOKDocView_Impl::signalButton: end of drag graphic handle #%d"
,
i
);
priv
->
m_bInDragGraphicHandles
[
i
]
=
false
;
priv
->
m_pDocument
->
pClass
->
setGraphicSelection
(
priv
->
m_pDocument
,
LOK_SETGRAPHICSELECTION_END
,
pixelToTwip
(
pEvent
->
x
,
priv
->
m_fZoom
),
pixelToTwip
(
pEvent
->
y
,
priv
->
m_fZoom
));
GTask
*
task
=
g_task_new
(
pDocView
,
NULL
,
NULL
,
NULL
);
LOEvent
*
pLOEvent
=
new
LOEvent
(
LOK_SET_GRAPHIC_SELECTION
);
pLOEvent
->
m_nSetGraphicSelectionType
=
LOK_SETGRAPHICSELECTION_END
;
pLOEvent
->
m_nSetGraphicSelectionX
=
pixelToTwip
(
pEvent
->
x
,
priv
->
m_fZoom
);
pLOEvent
->
m_nSetGraphicSelectionY
=
pixelToTwip
(
pEvent
->
y
,
priv
->
m_fZoom
);
g_task_set_task_data
(
task
,
pLOEvent
,
g_free
);
g_thread_pool_push
(
lokThreadPool
,
g_object_ref
(
task
),
NULL
);
g_object_unref
(
task
);
return
FALSE
;
}
}
...
...
@@ -898,7 +908,17 @@ lok_doc_view_signal_button(GtkWidget* pWidget, GdkEventButton* pEvent)
{
g_info
(
"LOKDocView_Impl::signalButton: end of drag graphic selection"
);
priv
->
m_bInDragGraphicSelection
=
false
;
priv
->
m_pDocument
->
pClass
->
setGraphicSelection
(
priv
->
m_pDocument
,
LOK_SETGRAPHICSELECTION_END
,
pixelToTwip
(
pEvent
->
x
,
priv
->
m_fZoom
),
pixelToTwip
(
pEvent
->
y
,
priv
->
m_fZoom
));
GTask
*
task
=
g_task_new
(
pDocView
,
NULL
,
NULL
,
NULL
);
LOEvent
*
pLOEvent
=
new
LOEvent
(
LOK_SET_GRAPHIC_SELECTION
);
pLOEvent
->
m_nSetGraphicSelectionType
=
LOK_SETGRAPHICSELECTION_END
;
pLOEvent
->
m_nSetGraphicSelectionX
=
pixelToTwip
(
pEvent
->
x
,
priv
->
m_fZoom
);
pLOEvent
->
m_nSetGraphicSelectionY
=
pixelToTwip
(
pEvent
->
y
,
priv
->
m_fZoom
);
g_task_set_task_data
(
task
,
pLOEvent
,
g_free
);
g_thread_pool_push
(
lokThreadPool
,
g_object_ref
(
task
),
NULL
);
g_object_unref
(
task
);
return
FALSE
;
}
}
...
...
@@ -937,10 +957,17 @@ lok_doc_view_signal_button(GtkWidget* pWidget, GdkEventButton* pEvent)
{
g_info
(
"LOKDocView_Impl::signalButton: start of drag graphic handle #%d"
,
i
);
priv
->
m_bInDragGraphicHandles
[
i
]
=
true
;
priv
->
m_pDocument
->
pClass
->
setGraphicSelection
(
priv
->
m_pDocument
,
LOK_SETGRAPHICSELECTION_START
,
pixelToTwip
(
priv
->
m_aGraphicHandleRects
[
i
].
x
+
priv
->
m_aGraphicHandleRects
[
i
].
width
/
2
,
priv
->
m_fZoom
),
pixelToTwip
(
priv
->
m_aGraphicHandleRects
[
i
].
y
+
priv
->
m_aGraphicHandleRects
[
i
].
height
/
2
,
priv
->
m_fZoom
));
GTask
*
task
=
g_task_new
(
pDocView
,
NULL
,
NULL
,
NULL
);
LOEvent
*
pLOEvent
=
new
LOEvent
(
LOK_SET_GRAPHIC_SELECTION
);
pLOEvent
->
m_nSetGraphicSelectionType
=
LOK_SETGRAPHICSELECTION_START
;
pLOEvent
->
m_nSetGraphicSelectionX
=
pixelToTwip
(
priv
->
m_aGraphicHandleRects
[
i
].
x
+
priv
->
m_aGraphicHandleRects
[
i
].
width
/
2
,
priv
->
m_fZoom
);
pLOEvent
->
m_nSetGraphicSelectionY
=
pixelToTwip
(
priv
->
m_aGraphicHandleRects
[
i
].
y
+
priv
->
m_aGraphicHandleRects
[
i
].
height
/
2
,
priv
->
m_fZoom
);
g_task_set_task_data
(
task
,
pLOEvent
,
g_free
);
g_thread_pool_push
(
lokThreadPool
,
g_object_ref
(
task
),
NULL
);
g_object_unref
(
task
);
return
FALSE
;
}
}
...
...
@@ -1063,7 +1090,17 @@ lok_doc_view_signal_motion (GtkWidget* pWidget, GdkEventMotion* pEvent)
{
g_info
(
"lcl_signalMotion: start of drag graphic selection"
);
priv
->
m_bInDragGraphicSelection
=
true
;
priv
->
m_pDocument
->
pClass
->
setGraphicSelection
(
priv
->
m_pDocument
,
LOK_SETGRAPHICSELECTION_START
,
pixelToTwip
(
pEvent
->
x
,
priv
->
m_fZoom
),
pixelToTwip
(
pEvent
->
y
,
priv
->
m_fZoom
));
GTask
*
task
=
g_task_new
(
pDocView
,
NULL
,
NULL
,
NULL
);
LOEvent
*
pLOEvent
=
new
LOEvent
(
LOK_SET_GRAPHIC_SELECTION
);
pLOEvent
->
m_nSetGraphicSelectionType
=
LOK_SETGRAPHICSELECTION_START
;
pLOEvent
->
m_nSetGraphicSelectionX
=
pixelToTwip
(
pEvent
->
x
,
priv
->
m_fZoom
);
pLOEvent
->
m_nSetGraphicSelectionY
=
pixelToTwip
(
pEvent
->
y
,
priv
->
m_fZoom
);
g_task_set_task_data
(
task
,
pLOEvent
,
g_free
);
g_thread_pool_push
(
lokThreadPool
,
g_object_ref
(
task
),
NULL
);
g_object_unref
(
task
);
return
FALSE
;
}
...
...
@@ -1083,6 +1120,20 @@ lok_doc_view_signal_motion (GtkWidget* pWidget, GdkEventMotion* pEvent)
return
FALSE
;
}
static
void
setGraphicSelectionInThread
(
gpointer
data
)
{
GTask
*
task
=
G_TASK
(
data
);
LOKDocView
*
pDocView
=
LOK_DOC_VIEW
(
g_task_get_source_object
(
task
));
LOKDocViewPrivate
*
priv
=
static_cast
<
LOKDocViewPrivate
*>
(
lok_doc_view_get_instance_private
(
pDocView
));
LOEvent
*
pLOEvent
=
static_cast
<
LOEvent
*>
(
g_task_get_task_data
(
task
));
priv
->
m_pDocument
->
pClass
->
setGraphicSelection
(
priv
->
m_pDocument
,
pLOEvent
->
m_nSetGraphicSelectionType
,
pLOEvent
->
m_nSetGraphicSelectionX
,
pLOEvent
->
m_nSetGraphicSelectionY
);
}
static
void
postMouseEventInThread
(
gpointer
data
)
{
...
...
@@ -1282,6 +1333,9 @@ lokThreadFunc(gpointer data, gpointer /*user_data*/)
case
LOK_POST_MOUSE_EVENT
:
postMouseEventInThread
(
task
);
break
;
case
LOK_SET_GRAPHIC_SELECTION
:
setGraphicSelectionInThread
(
task
);
break
;
}
g_object_unref
(
task
);
...
...
libreofficekit/source/gtk/tilebuffer.hxx
Dosyayı görüntüle @
7c45a570
...
...
@@ -139,7 +139,8 @@ enum
LOK_SET_PART
,
LOK_POST_KEY
,
LOK_PAINT_TILE
,
LOK_POST_MOUSE_EVENT
LOK_POST_MOUSE_EVENT
,
LOK_SET_GRAPHIC_SELECTION
};
/**
...
...
@@ -196,6 +197,13 @@ struct LOEvent
int
m_nPostMouseEventCount
;
///@}
/// @name setGraphicSelection parameters
///@{
int
m_nSetGraphicSelectionType
;
int
m_nSetGraphicSelectionX
;
int
m_nSetGraphicSelectionY
;
///@}
/// Constructor to instantiate an object of type `type`.
LOEvent
(
int
type
)
:
m_nType
(
type
)
{}
...
...
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