X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fsp-namedview.cpp;h=44c3bf62013c42d84cffbf5f6facce5f66a42c01;hb=7adfbd503fbbc8c2c4829f245d24d36f96c105d1;hp=383f35416b6bd2dff691686823d5268167ddfe2b;hpb=3fe705e15cdc4bb77073e0b9fb84e1fd3951f52f;p=inkscape.git diff --git a/src/sp-namedview.cpp b/src/sp-namedview.cpp index 383f35416..44c3bf620 100644 --- a/src/sp-namedview.cpp +++ b/src/sp-namedview.cpp @@ -19,6 +19,7 @@ #include #include "display/canvas-grid.h" +#include "display/guideline.h" #include "helper/units.h" #include "svg/svg-color.h" #include "xml/repr.h" @@ -53,6 +54,7 @@ static void sp_namedview_remove_child(SPObject *object, Inkscape::XML::Node *chi static Inkscape::XML::Node *sp_namedview_write(SPObject *object, Inkscape::XML::Document *doc, Inkscape::XML::Node *repr, guint flags); static void sp_namedview_setup_guides(SPNamedView * nv); +static void sp_namedview_show_single_guide(SPGuide* guide, bool show); static gboolean sp_str_to_bool(const gchar *str); static gboolean sp_nv_read_opacity(const gchar *str, guint32 *color); @@ -241,6 +243,7 @@ static void sp_namedview_build(SPObject *object, SPDocument *document, Inkscape: sp_object_read_attr(object, "inkscape:window-height"); sp_object_read_attr(object, "inkscape:window-x"); sp_object_read_attr(object, "inkscape:window-y"); + sp_object_read_attr(object, "inkscape:window-maximized"); sp_object_read_attr(object, "inkscape:snap-global"); sp_object_read_attr(object, "inkscape:snap-bbox"); sp_object_read_attr(object, "inkscape:snap-nodes"); @@ -301,6 +304,7 @@ static void sp_namedview_release(SPObject *object) static void sp_namedview_set(SPObject *object, unsigned int key, const gchar *value) { SPNamedView *nv = SP_NAMEDVIEW(object); + // TODO investigate why we grab this and then never use it SPUnit const &px = sp_unit_get_by_id(SP_UNIT_PX); switch (key) { @@ -435,14 +439,18 @@ static void sp_namedview_set(SPObject *object, unsigned int key, const gchar *va object->requestModified(SP_OBJECT_MODIFIED_FLAG); break; case SP_ATTR_INKSCAPE_WINDOW_X: - nv->window_x = value ? atoi(value) : -1; // -1 means not set + nv->window_x = value ? atoi(value) : 0; object->requestModified(SP_OBJECT_MODIFIED_FLAG); break; case SP_ATTR_INKSCAPE_WINDOW_Y: - nv->window_y = value ? atoi(value) : -1; // -1 means not set + nv->window_y = value ? atoi(value) : 0; object->requestModified(SP_OBJECT_MODIFIED_FLAG); break; - case SP_ATTR_INKSCAPE_SNAP_GLOBAL: + case SP_ATTR_INKSCAPE_WINDOW_MAXIMIZED: + nv->window_maximized = value ? atoi(value) : 0; + object->requestModified(SP_OBJECT_MODIFIED_FLAG); + break; + case SP_ATTR_INKSCAPE_SNAP_GLOBAL: nv->snap_manager.snapprefs.setSnapEnabledGlobally(value ? sp_str_to_bool(value) : TRUE); object->requestModified(SP_OBJECT_MODIFIED_FLAG); break; @@ -639,15 +647,7 @@ static void sp_namedview_child_added(SPObject *object, Inkscape::XML::Node *chil sp_guide_sensitize(g, sp_desktop_canvas(static_cast (l->data)), TRUE); - if (nv->showguides) { - for (GSList *v = SP_GUIDE(g)->views; v != NULL; v = v->next) { - sp_canvas_item_show(SP_CANVAS_ITEM(v->data)); - } - } else { - for (GSList *v = SP_GUIDE(g)->views; v != NULL; v = v->next) { - sp_canvas_item_hide(SP_CANVAS_ITEM(v->data)); - } - } + sp_namedview_show_single_guide(SP_GUIDE(g), nv->showguides); } } } @@ -707,15 +707,7 @@ void SPNamedView::show(SPDesktop *desktop) if (desktop->guides_active) { sp_guide_sensitize(SP_GUIDE(l->data), sp_desktop_canvas(desktop), TRUE); } - if (showguides) { - for (GSList *v = SP_GUIDE(l->data)->views; v != NULL; v = v->next) { - sp_canvas_item_show(SP_CANVAS_ITEM(v->data)); - } - } else { - for (GSList *v = SP_GUIDE(l->data)->views; v != NULL; v = v->next) { - sp_canvas_item_hide(SP_CANVAS_ITEM(v->data)); - } - } + sp_namedview_show_single_guide(SP_GUIDE(l->data), showguides); } views = g_slist_prepend(views, desktop); @@ -746,20 +738,25 @@ void sp_namedview_window_from_document(SPDesktop *desktop) // restore window size and position stored with the document if (geometry_from_file) { - gint w = MIN(gdk_screen_width(), nv->window_width); - gint h = MIN(gdk_screen_height(), nv->window_height); - gint x = MIN(gdk_screen_width() - MIN_ONSCREEN_DISTANCE, nv->window_x); - gint y = MIN(gdk_screen_height() - MIN_ONSCREEN_DISTANCE, nv->window_y); - if (w>0 && h>0 && x>0 && y>0) { - x = MIN(gdk_screen_width() - w, x); - y = MIN(gdk_screen_height() - h, y); - } - if (w>0 && h>0) { - desktop->setWindowSize(w, h); - } - if (x>0 && y>0) { - desktop->setWindowPosition(Geom::Point(x, y)); - } + if (nv->window_maximized) { + Gtk::Window *win = desktop->getToplevel(); + if (win){ + win->maximize(); + } + } else { + gint w = MIN(gdk_screen_width(), nv->window_width); + gint h = MIN(gdk_screen_height(), nv->window_height); + // prevent the window from moving off the screen to the right or to the bottom + gint x = MIN(gdk_screen_width() - MIN_ONSCREEN_DISTANCE, nv->window_x); + gint y = MIN(gdk_screen_height() - MIN_ONSCREEN_DISTANCE, nv->window_y); + // prevent the window from moving off the screen to the left or to the top + x = MAX(MIN_ONSCREEN_DISTANCE - nv->window_width, x); + y = MAX(MIN_ONSCREEN_DISTANCE - nv->window_height, y); + if (w>0 && h>0) { + desktop->setWindowSize(w, h); + desktop->setWindowPosition(Geom::Point(x, y)); + } + } } // restore zoom and view @@ -823,15 +820,16 @@ void sp_namedview_document_from_window(SPDesktop *desktop) sp_repr_set_svg_double(view, "inkscape:cy", r.midpoint()[Geom::Y]); if (save_geometry_in_file) { - gint w, h, x, y; + gint w, h, x, y; desktop->getWindowGeometry(x, y, w, h); sp_repr_set_int(view, "inkscape:window-width", w); sp_repr_set_int(view, "inkscape:window-height", h); sp_repr_set_int(view, "inkscape:window-x", x); sp_repr_set_int(view, "inkscape:window-y", y); + sp_repr_set_int(view, "inkscape:window-maximized", desktop->is_maximized()); } - view->setAttribute("inkscape:current-layer", SP_OBJECT_ID(desktop->currentLayer())); + view->setAttribute("inkscape:current-layer", desktop->currentLayer()->getId()); // restore undoability sp_document_set_undo_sensitive(sp_desktop_document(desktop), saved); @@ -864,18 +862,23 @@ void SPNamedView::activateGuides(gpointer desktop, gboolean active) static void sp_namedview_setup_guides(SPNamedView *nv) { for (GSList *l = nv->guides; l != NULL; l = l->next) { - if (nv->showguides) { - for (GSList *v = SP_GUIDE(l->data)->views; v != NULL; v = v->next) { - sp_canvas_item_show(SP_CANVAS_ITEM(v->data)); - } - } else { - for (GSList *v = SP_GUIDE(l->data)->views; v != NULL; v = v->next) { - sp_canvas_item_hide(SP_CANVAS_ITEM(v->data)); - } - } + sp_namedview_show_single_guide(SP_GUIDE(l->data), nv->showguides); } } +static void sp_namedview_show_single_guide(SPGuide* guide, bool show) +{ + for (GSList *v = guide->views; v != NULL; v = v->next) { + if (show) { + sp_canvas_item_show(SP_CANVAS_ITEM(v->data)); + sp_canvas_item_show(SP_CANVAS_ITEM(SP_GUIDELINE(v->data)->origin)); + } else { + sp_canvas_item_hide(SP_CANVAS_ITEM(v->data)); + sp_canvas_item_hide(SP_CANVAS_ITEM(SP_GUIDELINE(v->data)->origin)); + } + } +} + void sp_namedview_toggle_guides(SPDocument *doc, Inkscape::XML::Node *repr) { unsigned int v; @@ -975,7 +978,7 @@ SPNamedView *sp_document_namedview(SPDocument *document, const gchar *id) return (SPNamedView *) nv; } - while (nv && strcmp(nv->id, id)) { + while (nv && strcmp(nv->getId(), id)) { nv = sp_item_group_get_child_by_name((SPGroup *) document->root, nv, "sodipodi:namedview"); }