# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: z_lezhnin@mail2000.ru-20120401104326-6wsveeq7hkkqz4ae
# target_branch: http://bazaar.launchpad.net/~inkscape.dev/inkscape\
#   /trunk/
# testament_sha1: c47673d37b7df71a59564f3e06441e9230e33ffa
# timestamp: 2012-04-01 17:43:36 +0700
# base_revision_id: removethis.john.q.public@bigmail.com-\
#   20120316041522-q597ylywnxn86wdc
# 
# Begin patch
=== modified file 'src/ui/dialog/dialog-manager.cpp'
--- src/ui/dialog/dialog-manager.cpp	2012-03-09 09:28:41 +0000
+++ src/ui/dialog/dialog-manager.cpp	2012-04-01 10:43:26 +0000
@@ -262,14 +262,24 @@
             tracker->setAutodelete(true);
             timer = 0;
         }
-        dialog->present();
+        //checking if fullscreen, then on top
+        if (Inkscape::Preferences::get()->getBool("/desktop/geometry/fullscreen"))
+        {
+            //call 2 times for focus
+            dialog->show();
+            dialog->show();
+        }
+        else
+        {
+            dialog->present();
+        }
     }
 
     if ( timer ) {
         g_timer_destroy(timer);
         timer = 0;
     }
-}
+} 
 
 } // namespace Dialog
 } // namespace UI

=== modified file 'src/widgets/desktop-widget.cpp'
--- src/widgets/desktop-widget.cpp	2012-03-07 20:27:39 +0000
+++ src/widgets/desktop-widget.cpp	2012-04-01 10:43:26 +0000
@@ -1222,6 +1222,8 @@
 sp_desktop_widget_maximize(SPDesktopWidget *dtw)
 {
     GtkWindow *topw = GTK_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(dtw->canvas)));
+    //параметры
+    Inkscape::Preferences *prefs = Inkscape::Preferences::get();
     if (GTK_IS_WINDOW(topw)) {
         if (dtw->desktop->is_maximized()) {
             gtk_window_unmaximize(topw);
@@ -1231,7 +1233,6 @@
             // a separate non-maximized size.
             if (!dtw->desktop->is_iconified() && !dtw->desktop->is_fullscreen())
             {
-                Inkscape::Preferences *prefs = Inkscape::Preferences::get();
                 gint w, h, x, y;
                 dtw->getWindowGeometry(x, y, w, h);
                 prefs->setInt("/desktop/geometry/width", w);
@@ -1249,9 +1250,12 @@
 {
 #ifdef HAVE_GTK_WINDOW_FULLSCREEN
     GtkWindow *topw = GTK_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(dtw->canvas)));
+    Inkscape::Preferences *prefs = Inkscape::Preferences::get();
     if (GTK_IS_WINDOW(topw)) {
         if (dtw->desktop->is_fullscreen()) {
-            gtk_window_unfullscreen(topw);
+            gtk_window_unfullscreen(topw);        
+            //unset fullscreen for dialog opening
+            prefs->setBool("/desktop/geometry/fullscreen", 0);
             // widget layout is triggered by the resulting window_state_event
         } else {
             // Save geometry to prefs before maximizing so that
@@ -1259,7 +1263,6 @@
             // a separate non-maximized size.
             if (!dtw->desktop->is_iconified() && !dtw->desktop->is_maximized())
             {
-                Inkscape::Preferences *prefs = Inkscape::Preferences::get();
                 gint w, h, x, y;
                 dtw->getWindowGeometry(x, y, w, h);
                 prefs->setInt("/desktop/geometry/width", w);
@@ -1267,6 +1270,8 @@
                 prefs->setInt("/desktop/geometry/x", x);
                 prefs->setInt("/desktop/geometry/y", y);
             }
+            //set maximize option for dialog opening options
+            prefs->setBool("/desktop/geometry/fullscreen", 1);
             gtk_window_fullscreen(topw);
             // widget layout is triggered by the resulting window_state_event
         }

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWQ44jFAAAstfykRQUHf//1Ik
QCC////6UAhCBOAAUAW3u4hpzdnN1XZ0IkuvCURE2mSHoNTFNpTyI9TNJ6E0NA9QAZAlIIZGTUMo
9Q9QBoMgNNA0BoACRIQIyNKeKeozU9NIzUaPUNA0BoABiaMJpkyZMgZMEwjJkxMmEwCNoJJCaAmS
bTEmU8KYn6ie1I9IGgDIANBDFK/XD2mYZ9ifKKuu+GD+2yiBpdgWzRV1LqRhhptCxjewjeO4D38C
FjyEaLwRawCIKxgDuksNZ6DnG2JsN3Z60fGllJyNGaIdHDxc41VGvsqU3SljShZ3amSzxOB9/A5G
W0ZQUfKiWE7qWTYDJh6vmQL5Zq7S7nGzygfAcnUlyEyoGKRD7G0o6Ndj0qixHOJx1d1hipLkH1A5
hMgK3OFIiQsbywS1+iFMg0vUU8l4fQMArQcepnHunWbFtMVipl0pkqkliM0PcJ3iDSg4eWEqANCq
8cC65igC1UAsKwr8ZlpKgt1oTXSeELeBR9tlfaK+oxmxYOTev2UA7N5m42ZQMRTpomhUFoFkgC4U
/KVab9WHaEGflwyvUSdPlNXVpJCuwiXF1uIru/MoybHz2rQglFWyFVRChSUBCiCgxZdUF7WqmcCW
QY88RJ7CQojRJEE85qqsxwz5CdkKCsCUpRdDeEarlyl5dIrhGK64EWOF1iI0SIKU1TmNRykCMbSl
8nW1IxNIFW0br3pRLAxVBVAVOjFsmXGiygfK8qdJWNItaQLOOam+V1CC55WovIMMnWWOMJ7wjozv
tDnITG6fIViZAVRW6JiXV26mFt2msonk0Y0VJSDOQNJTbIvA0iYkdAdqFREStUnLyXpaYZi9+bVp
COpYNpaYJL1o30qrmW1EiKaMHYpC0osFtHzyID5rJQCSGVLkK8MsO2aiLMJKVsgcBXFFcidjv4ge
pdxcc2Rt6Rs7o+TyG/mFrCpBzZbWNN/LKo8x15l3hTo3bCN6Br9c4d/Q0NIouw2GspYX7uOw0bUR
4uAkeCFid3FCymYRAugo2kRddaUgZaLmaQ5nF3zDgGvehUdJnvZBGkGTFoKX9J58BH7zIrizFDit
VnPB82he0IsLMl2yBEuhz6S0ozBELxzD0XdKo7M4NIHMnd6LMuxH5qxxHib2oMLcuyPc24XcalO2
KFRgQ7PSoysghwvwGQZ0zEp8d0n2TqhyImYBSBROI041P0LM9AOsZDkNUa3qlMFgSAMuvC+9E0+g
wZbaZxQIlCTFQPT/CKOipH22IJaTYbcDccbVciVfU7Cs2sXV1VhLgqQUjpbG0MW8TNlSkqLvrmfL
gFp2PNomJW1oxAiHARTKchWoJTRurEbQdad3ijtB02OqdZBYheQUVlGlmQetFOd72w9m90k5chuI
b0Y+dpDDULoDcT86HUAZwM4pxTm1cApBkEEQeDxToNQauttHUA4RMlM3IXBVB2iuD1IN8HOvBuym
jldyfI4zBSimSnDhtD2A+NigogdatK0RMUTjQ1UKhfdcIsPqiu22aUmDW9Rz00Rn26xHvCpSCtO0
xaOl4e1Xb0VEMhYXqEMrnKq8JzF8gmCE2lhgcrxQVMbBafA4mVExtxByYNiwAfiAyr0wE9HTWl4o
zhUEUTJPl4dKp0XLZFfRSmdBngrT1cKjEdINoSUuGkW9KbeNnHYXzWJIyIgrFkDbBULcBrkjINQ1
B0Bmaa8LGiEtu6FJhc2MLgyYrRYFQUOC1wE7MFheBdfTkQYA9KwqEUevBMWnhDcnNmAj7hH4cM6x
FBDo7BMjLkg1QXeBgcyY3cq5QqSO4Mf8AAwsAAyL0ZAGzF3JFOFCQDjiMUA=