diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-05-22 13:23:33 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-05-28 09:35:37 +0200 |
| commit | 134fa6a4999ccf0ed7b8cff7258bfa3d0e291b46 (patch) | |
| tree | 71e8c43f5a14675c74d34b6c30ca5fc4e2911e9a /libreofficekit | |
| parent | 9ad8490e1154d5667249d56a63c9c00111cafa4d (diff) | |
gtktiledviewer: avoid a number of pointless re-rendering on startup
Change-Id: Ia7f63a6fa7505da50e6580ea009975e06a0cb65c
(cherry picked from commit 2807bcc186c976e55b6844d3459e2b0fbb92cdb8)
Diffstat (limited to 'libreofficekit')
| -rw-r--r-- | libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx index 7509b2f98164..903c2474875c 100644 --- a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx +++ b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx @@ -362,7 +362,6 @@ int main( int argc, char* argv[] ) GtkWidget* pComboBox = gtk_combo_box_text_new(); gtk_container_add( GTK_CONTAINER(pPartSelectorToolItem), pComboBox ); gtk_toolbar_insert( GTK_TOOLBAR(pToolbar), pPartSelectorToolItem, -1 ); - g_signal_connect( G_OBJECT(pComboBox), "changed", G_CALLBACK(changePart), NULL ); pPartSelector = GTK_COMBO_BOX_TEXT(pComboBox); @@ -373,7 +372,6 @@ int main( int argc, char* argv[] ) GtkWidget* pPartModeComboBox = gtk_combo_box_text_new(); gtk_container_add( GTK_CONTAINER(pPartModeSelectorToolItem), pPartModeComboBox ); gtk_toolbar_insert( GTK_TOOLBAR(pToolbar), pPartModeSelectorToolItem, -1 ); - g_signal_connect( G_OBJECT(pPartModeComboBox), "changed", G_CALLBACK(changePartMode), NULL ); #endif gtk_toolbar_insert( GTK_TOOLBAR(pToolbar), gtk_separator_tool_item_new(), -1); @@ -451,8 +449,12 @@ int main( int argc, char* argv[] ) #if ( GTK_MAJOR_VERSION == 2 && GTK_MINOR_VERSION >= 24 ) || GTK_MAJOR_VERSION > 2 populatePartSelector(); populatePartModeSelector( GTK_COMBO_BOX_TEXT(pPartModeComboBox) ); + // Connect these signals after populating the selectors, to avoid re-rendering on setting the default part/partmode. + g_signal_connect(G_OBJECT(pPartModeComboBox), "changed", G_CALLBACK(changePartMode), 0); #endif + g_signal_connect(G_OBJECT(pPartSelector), "changed", G_CALLBACK(changePart), 0); + gtk_main(); pOffice->pClass->destroy( pOffice ); |