diff options
| author | Tavmjong Bah <tavmjong@free.fr> | 2017-02-01 20:03:54 +0000 |
|---|---|---|
| committer | tavmjong-free <tavmjong@free.fr> | 2017-02-01 20:03:54 +0000 |
| commit | f1ddd1e70dbd780b0620bb86682ac0b55db0afce (patch) | |
| tree | 2341a6791dac54782952195cf7b67e00de0fbe19 /src/widgets/desktop-widget.cpp | |
| parent | Avoid crash when opening files containing hrefs with invalid "file:" URIs (diff) | |
| download | inkscape-f1ddd1e70dbd780b0620bb86682ac0b55db0afce.tar.gz inkscape-f1ddd1e70dbd780b0620bb86682ac0b55db0afce.zip | |
Prevent display units from effecting 'line-height' unit.
Allow relative units to be saved in preferences for 'line-height'.
Fixed bugs:
- https://launchpad.net/bugs/1562217
(bzr r15462)
Diffstat (limited to 'src/widgets/desktop-widget.cpp')
| -rw-r--r-- | src/widgets/desktop-widget.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/widgets/desktop-widget.cpp b/src/widgets/desktop-widget.cpp index 1884a685e..0a43bc7b2 100644 --- a/src/widgets/desktop-widget.cpp +++ b/src/widgets/desktop-widget.cpp @@ -1749,9 +1749,16 @@ void SPDesktopWidget::namedviewModified(SPObject *obj, guint flags) if (GTK_IS_CONTAINER(i->data)) { GList *grch = gtk_container_get_children (GTK_CONTAINER(i->data)); for (GList *j = grch; j != NULL; j = j->next) { + if (!GTK_IS_WIDGET(j->data)) // wasn't a widget continue; + // Don't apply to text toolbar. We want to be able to + // use different units for text. (Bug 1562217) + const gchar* name = gtk_widget_get_name( (GTK_WIDGET(j->data)) ); + if (strcmp( name, "TextToolbar") == 0) + continue; + gpointer t = sp_search_by_data_recursive(GTK_WIDGET(j->data), (gpointer) "tracker"); if (t == NULL) // didn't find any tracker data continue; |