![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index c182fe0174896b38a507ee01ed72f313902a883e..a64d53bb61e7c21719f0adb44793efec267d5a2e 100644 (file)
/** \file
* Desktop widget implementation
- *
- * Authors:
+ */
+/* Authors:
* Lauris Kaplinski <lauris@kaplinski.com>
* MenTaLguY <mental@rydia.net>
* bulia byak <buliabyak@users.sf.net>
#include "widgets/spw-utilities.h"
#include "widgets/spinbutton-events.h"
#include "widgets/layer-selector.h"
+#include "widgets/toolbox.h"
#include "ui/dialog/dialog-manager.h"
#include "ui/widget/dock.h"
#include "ui/widget/selected-style.h"
#include "ege-select-one-action.h"
#include "ege-color-prof-tracker.h"
#include "color-profile-fns.h"
-#include "xml/node-observer.h"
#include "box3d-context.h"
#include "sp-image.h"
SPViewWidgetClass *dtw_parent_class;
-using Inkscape::XML::Node;
-
-class PrefWatcher : public Inkscape::XML::NodeObserver {
+class CMSPrefWatcher {
public:
- PrefWatcher();
- virtual ~PrefWatcher();
-
-
- virtual void notifyChildAdded( Node &/*node*/, Node &/*child*/, Node */*prev*/ ) {}
- virtual void notifyChildRemoved( Node &/*node*/, Node &/*child*/, Node */*prev*/ ) {}
- virtual void notifyChildOrderChanged( Node &/*node*/, Node &/*child*/,
- Node */*old_prev*/, Node */*new_prev*/ ) {}
- virtual void notifyContentChanged( Node &/*node*/,
- Inkscape::Util::ptr_shared<char> /*old_content*/,
- Inkscape::Util::ptr_shared<char> /*new_content*/ ) {}
- virtual void notifyAttributeChanged( Node &node, GQuark name,
- Inkscape::Util::ptr_shared<char> old_value,
- Inkscape::Util::ptr_shared<char> new_value );
- void add( SPDesktopWidget* dtw );
- void remove( SPDesktopWidget* dtw );
+ CMSPrefWatcher() :
+ _dpw(*this),
+ _spw(*this),
+ _tracker(ege_color_prof_tracker_new(0))
+ {
+ Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+ g_signal_connect( G_OBJECT(_tracker), "modified", G_CALLBACK(hook), this );
+ prefs->addObserver(_dpw);
+ prefs->addObserver(_spw);
+ }
+ virtual ~CMSPrefWatcher() {}
+
+ //virtual void notify(PrefValue &);
+ void add( SPDesktopWidget* dtw ) {
+ _widget_list.push_back(dtw);
+ }
+ void remove( SPDesktopWidget* dtw ) {
+ _widget_list.remove(dtw);
+ }
private:
- static void hook(EgeColorProfTracker *tracker, gint a, gint b, PrefWatcher *watcher);
+ static void hook(EgeColorProfTracker *tracker, gint a, gint b, CMSPrefWatcher *watcher);
- std::list<SPDesktopWidget*> dtws;
- EgeColorProfTracker *_tracker;
-};
+ class DisplayProfileWatcher : public Inkscape::Preferences::Observer {
+ public:
+ DisplayProfileWatcher(CMSPrefWatcher &pw) : Observer("/options/displayprofile"), _pw(pw) {}
+ virtual void notify(Inkscape::Preferences::Entry const &/*val*/) {
+ Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+ _pw._setCmsSensitive(!prefs->getString("/options/displayprofile/uri").empty());
+ _pw._refreshAll();
+ }
+ private:
+ CMSPrefWatcher &_pw;
+ };
-PrefWatcher::PrefWatcher() :
- NodeObserver(),
- dtws(),
- _tracker(0)
-{
- _tracker = ege_color_prof_tracker_new(0);
- g_signal_connect( G_OBJECT(_tracker), "modified", G_CALLBACK(hook), this );
-}
+ DisplayProfileWatcher _dpw;
-PrefWatcher::~PrefWatcher()
-{
-}
+ class SoftProofWatcher : public Inkscape::Preferences::Observer {
+ public:
+ SoftProofWatcher(CMSPrefWatcher &pw) : Observer("/options/softproof"), _pw(pw) {}
+ virtual void notify(Inkscape::Preferences::Entry const &) {
+ _pw._refreshAll();
+ }
+ private:
+ CMSPrefWatcher &_pw;
+ };
+
+ SoftProofWatcher _spw;
+
+ void _refreshAll();
+ void _setCmsSensitive(bool value);
+
+ std::list<SPDesktopWidget*> _widget_list;
+ EgeColorProfTracker *_tracker;
+
+ friend class DisplayProfileWatcher;
+ friend class SoftproofWatcher;
+};
-void PrefWatcher::hook(EgeColorProfTracker */*tracker*/, gint screen, gint monitor, PrefWatcher */*watcher*/)
+void CMSPrefWatcher::hook(EgeColorProfTracker */*tracker*/, gint screen, gint monitor, CMSPrefWatcher */*watcher*/)
{
#if ENABLE_LCMS
unsigned char* buf = 0;
@@ -166,57 +186,32 @@ void PrefWatcher::hook(EgeColorProfTracker */*tracker*/, gint screen, gint monit
#endif // ENABLE_LCMS
}
-void PrefWatcher::add( SPDesktopWidget* dtw )
-{
- dtws.push_back(dtw);
-}
-
-void PrefWatcher::remove( SPDesktopWidget* dtw )
+/// @todo Use conditional compilation in saner places. The whole PrefWatcher
+/// object is unnecessary if ENABLE_LCMS is not defined.
+void CMSPrefWatcher::_refreshAll()
{
- dtws.remove(dtw);
+#if ENABLE_LCMS
+ for ( std::list<SPDesktopWidget*>::iterator it = _widget_list.begin(); it != _widget_list.end(); ++it ) {
+ (*it)->requestCanvasUpdate();
+ }
+#endif // ENABLE_LCMS
}
-void PrefWatcher::notifyAttributeChanged( Node &node, GQuark name,
- Inkscape::Util::ptr_shared<char> /*old_value*/,
- Inkscape::Util::ptr_shared<char> /*new_value*/ )
+void CMSPrefWatcher::_setCmsSensitive(bool enabled)
{
#if ENABLE_LCMS
- (void)name;
- if ( strcmp("group", node.name()) == 0 ) {
- gchar const* id = node.attribute("id");
- bool refresh = false;
- if ( !id ) {
- // bad
- } else if (strcmp("displayprofile", id) == 0) {
- Inkscape::Preferences *prefs = Inkscape::Preferences::get();
- Glib::ustring current = prefs->getString("options.displayprofile", "uri");
- bool enabled = current.length() > 0;
-
- for ( std::list<SPDesktopWidget*>::iterator it = dtws.begin(); it != dtws.end(); ++it ) {
- SPDesktopWidget* dtw = *it;
- if ( GTK_WIDGET_SENSITIVE( dtw->cms_adjust ) != enabled ) {
- cms_adjust_set_sensitive( dtw, enabled );
- }
- }
- refresh = true;
- } else if (strcmp("softproof", id) == 0) {
- refresh = true;
- }
-
- if ( refresh ) {
- for ( std::list<SPDesktopWidget*>::iterator it = dtws.begin(); it != dtws.end(); ++it ) {
- (*it)->requestCanvasUpdate();
- }
+ for ( std::list<SPDesktopWidget*>::iterator it = _widget_list.begin(); it != _widget_list.end(); ++it ) {
+ SPDesktopWidget *dtw = *it;
+ if ( GTK_WIDGET_SENSITIVE( dtw->cms_adjust ) != enabled ) {
+ cms_adjust_set_sensitive( dtw, enabled );
}
+ }
#else
- {
- (void)node;
- (void)name;
+ (void) enabled;
#endif // ENABLE_LCMS
- }
}
-static PrefWatcher* watcher = 0;
+static CMSPrefWatcher* watcher = NULL;
void
SPDesktopWidget::setMessage (Inkscape::MessageType type, const gchar *message)
GtkWidget *hbox;
GtkWidget *eventbox;
GtkStyle *style;
-
+
Inkscape::Preferences *prefs = Inkscape::Preferences::get();
new (&dtw->modified_connection) sigc::connection();
{
using Inkscape::UI::Dialogs::SwatchesPanel;
- SwatchesPanel* swatches = new SwatchesPanel("embedded.swatches");
+ SwatchesPanel* swatches = new SwatchesPanel("/embedded/swatches");
swatches->setOrientation( Gtk::ANCHOR_SOUTH );
dtw->panels = GTK_WIDGET(swatches->gobj());
gtk_box_pack_end( GTK_BOX( dtw->vbox ), dtw->panels, FALSE, TRUE, 0 );
dtw->aux_toolbox = sp_aux_toolbox_new ();
gtk_box_pack_end (GTK_BOX (dtw->vbox), dtw->aux_toolbox, FALSE, TRUE, 0);
+ dtw->snap_toolbox = sp_snap_toolbox_new ();
+ gtk_box_pack_end (GTK_BOX (dtw->vbox), dtw->snap_toolbox, FALSE, TRUE, 0);
+
dtw->commands_toolbox = sp_commands_toolbox_new ();
gtk_box_pack_end (GTK_BOX (dtw->vbox), dtw->commands_toolbox, FALSE, TRUE, 0);
"sticky_zoom",
_("Zoom drawing if window size changes"),
dtw->tt);
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (dtw->sticky_zoom), prefs->getBool("options.stickyzoom", "value"));
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (dtw->sticky_zoom), prefs->getBool("/options/stickyzoom/value"));
gtk_box_pack_start (GTK_BOX (dtw->vscrollbar_box), dtw->sticky_zoom, FALSE, FALSE, 0);
dtw->vadj = (GtkAdjustment *) gtk_adjustment_new (0.0, -4000.0, 4000.0, 10.0, 100.0, 4.0);
dtw->vscrollbar = gtk_vscrollbar_new (GTK_ADJUSTMENT (dtw->vadj));
dtw->tt );
#if ENABLE_LCMS
{
- Glib::ustring current = prefs->getString("options.displayprofile", "uri");
+ Glib::ustring current = prefs->getString("/options/displayprofile/uri");
bool enabled = current.length() > 0;
cms_adjust_set_sensitive( dtw, enabled );
if ( enabled ) {
- bool active = prefs->getBool("options.displayprofile", "enable");
+ bool active = prefs->getBool("/options/displayprofile/enable");
if ( active ) {
sp_button_toggle_set_down( SP_BUTTON(dtw->cms_adjust), TRUE );
}
#endif // ENABLE_LCMS
gtk_table_attach( GTK_TABLE(canvas_tbl), dtw->cms_adjust, 2, 3, 2, 3, (GtkAttachOptions)(GTK_SHRINK), (GtkAttachOptions)(GTK_SHRINK), 0, 0);
{
- Inkscape::Preferences* prefs = Inkscape::Preferences::get();
if (!watcher) {
- watcher = new PrefWatcher();
- prefs->addPrefsObserver( watcher );
+ watcher = new CMSPrefWatcher();
}
watcher->add(dtw);
}
/* Canvas */
dtw->canvas = SP_CANVAS (sp_canvas_new_aa ());
#if ENABLE_LCMS
- dtw->canvas->enable_cms_display_adj = prefs->getBool("options.displayprofile", "enable");
+ dtw->canvas->enable_cms_display_adj = prefs->getBool("/options/displayprofile/enable");
#endif // ENABLE_LCMS
GTK_WIDGET_SET_FLAGS (GTK_WIDGET (dtw->canvas), GTK_CAN_FOCUS);
style = gtk_style_copy (GTK_WIDGET (dtw->canvas)->style);
style->bg[GTK_STATE_NORMAL] = style->white;
gtk_widget_set_style (GTK_WIDGET (dtw->canvas), style);
- if ( prefs->getBool("options.useextinput", "value", true) )
+ if ( prefs->getBool("/options/useextinput/value", true) )
gtk_widget_set_extension_events(GTK_WIDGET (dtw->canvas) , GDK_EXTENSION_EVENTS_ALL); //set extension events for tablets, unless disabled in preferences
g_signal_connect (G_OBJECT (dtw->canvas), "event", G_CALLBACK (sp_desktop_widget_event), dtw);
gtk_table_attach (GTK_TABLE (canvas_tbl), GTK_WIDGET(dtw->canvas), 1, 2, 1, 2, (GtkAttachOptions)(GTK_FILL | GTK_EXPAND), (GtkAttachOptions)(GTK_FILL | GTK_EXPAND), 0, 0);
/* Dock */
bool create_dock =
- prefs->getIntLimited("options.dialogtype", "value", Inkscape::UI::Dialog::FLOATING, 0, 1) ==
+ prefs->getIntLimited("/options/dialogtype/value", Inkscape::UI::Dialog::FLOATING, 0, 1) ==
Inkscape::UI::Dialog::DOCK;
if (create_dock) {
}
if (GTK_WIDGET_REALIZED (widget)) {
- Geom::Rect const area = to_2geom(dtw->desktop->get_display_area());
+ Geom::Rect const area = dtw->desktop->get_display_area();
double zoom = dtw->desktop->current_zoom();
if (GTK_WIDGET_CLASS(dtw_parent_class)->size_allocate) {
/* Calculate zoom per pixel */
double const zpsp = zoom / hypot (area.dimensions()[Geom::X], area.dimensions()[Geom::Y]);
/* Find new visible area */
- Geom::Rect newarea = to_2geom(dtw->desktop->get_display_area());
+ Geom::Rect newarea = dtw->desktop->get_display_area();
/* Calculate adjusted zoom */
zoom = zpsp * hypot(newarea.dimensions()[Geom::X], newarea.dimensions()[Geom::Y]);
dtw->desktop->zoom_absolute(newarea.midpoint()[Geom::X], newarea.midpoint()[Geom::Y], zoom);
dtw->canvas->enable_cms_display_adj = down;
dtw->requestCanvasUpdate();
Inkscape::Preferences *prefs = Inkscape::Preferences::get();
- prefs->setBool("options.displayprofile", "enable", down);
+ prefs->setBool("/options/displayprofile/enable", down);
}
#endif // ENABLE_LCMS
}
Inkscape::Preferences *prefs = Inkscape::Preferences::get();
bool maxed = desktop->is_maximized();
bool full = desktop->is_fullscreen();
- prefs->setBool("desktop.geometry", "fullscreen", full);
- prefs->setBool("desktop.geometry", "maximized", maxed);
+ prefs->setBool("/desktop/geometry/fullscreen", full);
+ prefs->setBool("/desktop/geometry/maximized", maxed);
gint w, h, x, y;
desktop->getWindowGeometry(x, y, w, h);
// Don't save geom for maximized windows. It
// just tells you the current maximized size, which is not
// as useful as whatever value it had previously.
if (!maxed && !full) {
- prefs->setInt("desktop.geometry", "width", w);
- prefs->setInt("desktop.geometry", "height", h);
- prefs->setInt("desktop.geometry", "x", x);
- prefs->setInt("desktop.geometry", "y", y);
+ prefs->setInt("/desktop/geometry/width", w);
+ prefs->setInt("/desktop/geometry/height", h);
+ prefs->setInt("/desktop/geometry/x", x);
+ prefs->setInt("/desktop/geometry/y", y);
}
}
Inkscape::Preferences *prefs = Inkscape::Preferences::get();
gint w, h, x, y;
dtw->getWindowGeometry(x, y, w, h);
- prefs->setInt("desktop.geometry", "width", w);
- prefs->setInt("desktop.geometry", "height", h);
- prefs->setInt("desktop.geometry", "x", x);
- prefs->setInt("desktop.geometry", "y", y);
+ prefs->setInt("/desktop/geometry/width", w);
+ prefs->setInt("/desktop/geometry/height", h);
+ prefs->setInt("/desktop/geometry/x", x);
+ prefs->setInt("/desktop/geometry/y", y);
}
gtk_window_maximize(topw);
}
Inkscape::Preferences *prefs = Inkscape::Preferences::get();
gint w, h, x, y;
dtw->getWindowGeometry(x, y, w, h);
- prefs->setInt("desktop.geometry", "width", w);
- prefs->setInt("desktop.geometry", "height", h);
- prefs->setInt("desktop.geometry", "x", x);
- prefs->setInt("desktop.geometry", "y", y);
+ prefs->setInt("/desktop/geometry/width", w);
+ prefs->setInt("/desktop/geometry/height", h);
+ prefs->setInt("/desktop/geometry/x", x);
+ prefs->setInt("/desktop/geometry/y", y);
}
gtk_window_fullscreen(topw);
// widget layout is triggered by the resulting window_state_event
void
sp_desktop_widget_layout (SPDesktopWidget *dtw)
{
- bool fullscreen = dtw->desktop->is_fullscreen();
+ Glib::ustring pref_root;
Inkscape::Preferences *prefs = Inkscape::Preferences::get();
- if (!prefs->getBool(( fullscreen ? "fullscreen.menu" : "window.menu" ), "state", true)) {
+ if (dtw->desktop->is_focusMode()) {
+ pref_root = "/focus/";
+ } else if (dtw->desktop->is_fullscreen()) {
+ pref_root = "/fullscreen/";
+ } else {
+ pref_root = "/window/";
+ }
+
+ if (!prefs->getBool(pref_root + "menu/state", true)) {
gtk_widget_hide_all (dtw->menubar);
} else {
gtk_widget_show_all (dtw->menubar);
}
- if (!prefs->getBool(( fullscreen ? "fullscreen.commands" : "window.commands" ), "state", true)) {
+ if (!prefs->getBool(pref_root + "commands/state", true)) {
gtk_widget_hide_all (dtw->commands_toolbox);
} else {
gtk_widget_show_all (dtw->commands_toolbox);
}
- if (!prefs->getBool(( fullscreen ? "fullscreen.toppanel" : "window.toppanel" ), "state", true)) {
+ if (!prefs->getBool(pref_root + "snaptoolbox/state", true)) {
+ gtk_widget_hide_all (dtw->snap_toolbox);
+ } else {
+ gtk_widget_show_all (dtw->snap_toolbox);
+ }
+
+ if (!prefs->getBool(pref_root + "toppanel/state", true)) {
gtk_widget_hide_all (dtw->aux_toolbox);
} else {
// we cannot just show_all because that will show all tools' panels;
show_aux_toolbox (dtw->aux_toolbox);
}
- if (!prefs->getBool(( fullscreen ? "fullscreen.toolbox" : "window.toolbox" ), "state", true)) {
+ if (!prefs->getBool(pref_root + "toolbox/state", true)) {
gtk_widget_hide_all (dtw->tool_toolbox);
} else {
gtk_widget_show_all (dtw->tool_toolbox);
}
- if (!prefs->getBool(( fullscreen ? "fullscreen.statusbar" : "window.statusbar" ), "state", true)) {
+ if (!prefs->getBool(pref_root + "statusbar/state", true)) {
gtk_widget_hide_all (dtw->statusbar);
} else {
gtk_widget_show_all (dtw->statusbar);
}
- if (!prefs->getBool(( fullscreen ? "fullscreen.panels" : "window.panels" ), "state", true)) {
+ if (!prefs->getBool(pref_root + "panels/state", true)) {
gtk_widget_hide_all( dtw->panels );
} else {
gtk_widget_show_all( dtw->panels );
}
- if (!prefs->getBool(( fullscreen ? "fullscreen.scrollbars" : "window.scrollbars" ), "state", true)) {
+ if (!prefs->getBool(pref_root + "scrollbars/state", true)) {
gtk_widget_hide_all (dtw->hscrollbar);
gtk_widget_hide_all (dtw->vscrollbar_box);
gtk_widget_hide_all( dtw->cms_adjust );
gtk_widget_show_all( dtw->cms_adjust );
}
- if (!prefs->getBool(( fullscreen ? "fullscreen.rulers" : "window.rulers" ), "state", true)) {
+ if (!prefs->getBool(pref_root + "rulers/state", true)) {
gtk_widget_hide_all (dtw->hruler);
gtk_widget_hide_all (dtw->vruler);
} else {
sp_tool_toolbox_set_desktop (dtw->tool_toolbox, dtw->desktop);
sp_aux_toolbox_set_desktop (dtw->aux_toolbox, dtw->desktop);
sp_commands_toolbox_set_desktop (dtw->commands_toolbox, dtw->desktop);
+ sp_snap_toolbox_set_desktop (dtw->snap_toolbox, dtw->desktop);
return SP_VIEW_WIDGET (dtw);
}
@@ -1406,7 +1417,7 @@ sp_desktop_widget_namedview_modified (SPObject *obj, guint flags, SPDesktopWidge
{
SPNamedView *nv=SP_NAMEDVIEW(obj);
if (flags & SP_OBJECT_MODIFIED_FLAG) {
- dtw->dt2r = 1.0 / nv->doc_units->unittobase;
+ dtw->dt2r = 1.0 / nv->doc_units->unittobase;
dtw->ruler_origin = Geom::Point(0,0); //nv->gridorigin; Why was the grid origin used here?
sp_ruler_set_metric (GTK_RULER (dtw->vruler), nv->getDefaultMetric());
@@ -1416,6 +1427,7 @@ sp_desktop_widget_namedview_modified (SPObject *obj, guint flags, SPDesktopWidge
gtk_tooltips_set_tip (dtw->tt, dtw->vruler_box, gettext(sp_unit_get_plural (nv->doc_units)), NULL);
sp_desktop_widget_update_rulers (dtw);
+ update_snap_toolbox(dtw->desktop, NULL, dtw->snap_toolbox);
}
}
@@ -1440,7 +1452,7 @@ sp_desktop_widget_adjustment_value_changed (GtkAdjustment */*adj*/, SPDesktopWid
bool SPDesktopWidget::onFocusInEvent(GdkEventFocus*)
{
Inkscape::Preferences *prefs = Inkscape::Preferences::get();
- if (prefs->getBool("options.bitmapautoreload", "value", true)) {
+ if (prefs->getBool("/options/bitmapautoreload/value", true)) {
GSList const *imageList = sp_document_get_resource_list(desktop->doc(), "image");
for (GSList const *p = imageList; p; p = p->next) {
SPImage* image = SP_IMAGE(p->data);
SPDesktopWidget *dtw = SP_DESKTOP_WIDGET (data);
SPDesktop *desktop = dtw->desktop;
- Geom::Rect const d = to_2geom(desktop->get_display_area());
+ Geom::Rect const d = desktop->get_display_area();
g_signal_handler_block (spin, dtw->zoom_update);
desktop->zoom_absolute (d.midpoint()[Geom::X], d.midpoint()[Geom::Y], zoom_factor);
g_signal_handler_unblock (spin, dtw->zoom_update);
@@ -1558,7 +1570,7 @@ sp_dtw_zoom_populate_popup (GtkEntry */*entry*/, GtkMenu *menu, gpointer data)
static void
sp_dtw_zoom_menu_handler (SPDesktop *dt, gdouble factor)
{
- Geom::Rect const d = to_2geom(dt->get_display_area());
+ Geom::Rect const d = dt->get_display_area();
dt->zoom_absolute(d.midpoint()[Geom::X], d.midpoint()[Geom::Y], factor);
}
if (GTK_WIDGET_VISIBLE (dtw->hruler)) {
gtk_widget_hide_all (dtw->hruler);
gtk_widget_hide_all (dtw->vruler);
- prefs->setBool(dtw->desktop->is_fullscreen() ? "fullscreen.rulers" : "window.rulers", "state", false);
+ prefs->setBool(dtw->desktop->is_fullscreen() ? "/fullscreen/rulers/state" : "/window/rulers/state", false);
} else {
gtk_widget_show_all (dtw->hruler);
gtk_widget_show_all (dtw->vruler);
- prefs->setBool(dtw->desktop->is_fullscreen() ? "fullscreen.rulers" : "window.rulers", "state", true);
+ prefs->setBool(dtw->desktop->is_fullscreen() ? "/fullscreen/rulers/state" : "/window/rulers/state", true);
}
}
gtk_widget_hide_all (dtw->hscrollbar);
gtk_widget_hide_all (dtw->vscrollbar_box);
gtk_widget_hide_all( dtw->cms_adjust );
- prefs->setBool(dtw->desktop->is_fullscreen() ? "fullscreen.scrollbars" : "window.scrollbars", "state", false);
+ prefs->setBool(dtw->desktop->is_fullscreen() ? "/fullscreen/scrollbars/state" : "/window/scrollbars/state", false);
} else {
gtk_widget_show_all (dtw->hscrollbar);
gtk_widget_show_all (dtw->vscrollbar_box);
gtk_widget_show_all( dtw->cms_adjust );
- prefs->setBool(dtw->desktop->is_fullscreen() ? "fullscreen.scrollbars" : "window.scrollbars", "state", true);
+ prefs->setBool(dtw->desktop->is_fullscreen() ? "/fullscreen/scrollbars/state" : "/window/scrollbars/state", true);
}
}
Inkscape::Preferences *prefs = Inkscape::Preferences::get();
if (GTK_WIDGET_VISIBLE (dtw->menubar)) {
gtk_widget_hide_all (dtw->menubar);
- prefs->setBool(is_fullscreen ? "fullscreen.menu" : "window.menu", "state", false);
+ prefs->setBool(is_fullscreen ? "/fullscreen/menu/state" : "/window/menu/state", false);
} else {
gtk_widget_show_all (dtw->menubar);
- prefs->setBool(is_fullscreen ? "fullscreen.menu" : "window.menu", "state", true);
+ prefs->setBool(is_fullscreen ? "/fullscreen/menu/state" : "/window/menu/state", true);
}
}
*/
/* The desktop region we always show unconditionally */
SPDocument *doc = dtw->desktop->doc();
- NR::Rect darea(Geom::Point(-sp_document_width(doc), -sp_document_height(doc)),
- Geom::Point(2 * sp_document_width(doc), 2 * sp_document_height(doc)));
- darea = NR::union_bounds(darea, sp_item_bbox_desktop(SP_ITEM(SP_DOCUMENT_ROOT(doc))));
+ Geom::Rect darea ( Geom::Point(-sp_document_width(doc), -sp_document_height(doc)),
+ Geom::Point(2 * sp_document_width(doc), 2 * sp_document_height(doc)) );
+ SPObject* root = doc->root;
+ SPItem* item = SP_ITEM(root);
+ Geom::OptRect deskarea = Geom::unify(darea, sp_item_bbox_desktop(item));
/* Canvas region we always show unconditionally */
- NR::Rect carea(Geom::Point(darea.min()[Geom::X] * scale - 64,
- darea.max()[Geom::Y] * -scale - 64),
- Geom::Point(darea.max()[Geom::X] * scale + 64,
- darea.min()[Geom::Y] * -scale + 64));
+ Geom::Rect carea( Geom::Point(deskarea->min()[Geom::X] * scale - 64, deskarea->max()[Geom::Y] * -scale - 64),
+ Geom::Point(deskarea->max()[Geom::X] * scale + 64, deskarea->min()[Geom::Y] * -scale + 64) );
- NR::Rect viewbox = dtw->canvas->getViewbox();
+ Geom::Rect viewbox = dtw->canvas->getViewbox();
/* Viewbox is always included into scrollable region */
- carea = NR::union_bounds(carea, viewbox);
+ carea = Geom::unify(carea, viewbox);
set_adjustment(dtw->hadj, carea.min()[Geom::X], carea.max()[Geom::X],
viewbox.dimensions()[Geom::X],