update to trunk

(bzr r13645.1.131)

3 files changed, 53 insertions, 11 deletions

diff --git a/share/ui/style.css b/share/ui/style.css
index 3ee6f7450..091cfc319 100644
--- a/share/ui/style.css
+++ b/share/ui/style.css
@@ -4,16 +4,32 @@
 /*
  * Keep in order of:
  *   General -> Specific
- *   Order of default appearance
- *     Top -> Bottom (e.g. Selector Tool, Node Tool, ...)
- *     Left -> Right
+ *   Order of appearance in widget tree.
+ *   See GtkInspector
+ *     GTK_DEBUG=interactive ~/path_to_gtk3/bin/inkscape
  *
  * We need a standardized naming scheme.
  *
  * As of Gtk 3.20, you cannot use widget names.
  */
 
-/* Lightest to darkest based on linear rgb */
+/* Standard theme based colors. Prefer these.
+ *
+ * @theme_bg_color
+ * @theme_fg_color
+ * @theme_base_color
+ * @theme_text_color
+ * @theme_selected_bg_color
+ * @theme_selected_fg_color
+ * @theme_tooltip_bg_color
+ * @theme_tooltip_fg_color
+ *
+ */
+
+
+/* Our own custom shades... better not to use.
+ * Lightest to darkest based on linear rgb.
+ */
 @define-color bg_color0  #ffffff; /* White */
 @define-color bg_color05 #f8f8f8; /* Slightly off white */
 @define-color bg_color1  #f0f0f0;
@@ -25,22 +41,45 @@
 @define-color bg_color7  #636363;
 @define-color bg_color8  #000000; /* Black */
 
+/* Gtk  <= 3.18 */
 GtkWidget {
 /*    font-size: 12pt; */
 }
 
-/* Gtk  <= 3.18 */
+/* Gtk  >= 3.19.2 */
+widget {
+/*    font-size: 12pt; */
+}
+
+GtkSpinButton {
+    padding: 0;
+}
+
+spinbutton {
+    padding: 0;
+}
+
+GtkSpinButton.entry {
+    padding-left: 2px;
+}
+
+spinbutton.entry {
+    padding-left: 2px;
+}
+
 SPRuler {
-    background-color: @bg_color05;
+    background-color: @theme_bg_color;
+    color:            @theme_fg_color;
 }
 
-/* Gtk  > 3.18 */
 ruler-widget {
-    background-color: @bg_color05;
+    background-color: @theme_bg_color;
+    color:            @theme_fg_color;
 }
 
+/* The actual canvas (Inkscape's drawing area). */
 SPCanvas {
-    background-color: @bg_color0;
+    background-color: white;
 }
 
 combobox window.popup scrolledwindow treeview separator {
diff --git a/src/live_effects/effect.cpp b/src/live_effects/effect.cpp
index 437aed5bd..cee872f9f 100644
--- a/src/live_effects/effect.cpp
+++ b/src/live_effects/effect.cpp
@@ -135,7 +135,6 @@ const Util::EnumData<EffectType> LPETypeData[] = {
     {SIMPLIFY,              N_("Simplify"),                "simplify"},
     {LATTICE2,              N_("Lattice Deformation 2"),   "lattice2"},
     {PERSPECTIVE_ENVELOPE,  N_("Perspective/Envelope"),    "perspective-envelope"},
-    {FILLET_CHAMFER,        N_("Fillet/Chamfer"),          "fillet-chamfer"},
     {INTERPOLATE_POINTS,    N_("Interpolate points"),      "interpolate_points"},
     {TRANSFORM_2PTS,        N_("Transform by 2 points"),   "transform_2pts"},
     {SHOW_HANDLES,          N_("Show handles"),            "show_handles"},
@@ -145,6 +144,7 @@ const Util::EnumData<EffectType> LPETypeData[] = {
     {TAPER_STROKE,          N_("Taper stroke"),            "taper_stroke"},
     {MIRROR_SYMMETRY,       N_("Mirror symmetry"),         "mirror_symmetry"},
     {COPY_ROTATE,           N_("Rotate copies"),           "copy_rotate"},
+    {FILLET_CHAMFER,        N_("Fillet/Chamfer"),          "fillet-chamfer"},
 /* Ponyscape -> Inkscape 0.92*/
     {ATTACH_PATH,           N_("Attach path"),             "attach_path"},
     {FILL_BETWEEN_STROKES,  N_("Fill between strokes"),    "fill_between_strokes"},
diff --git a/src/ui/tools/freehand-base.cpp b/src/ui/tools/freehand-base.cpp
index 613857626..c98ecb686 100644
--- a/src/ui/tools/freehand-base.cpp
+++ b/src/ui/tools/freehand-base.cpp
@@ -43,6 +43,7 @@
 #include "snap.h"
 #include "sp-path.h"
 #include "sp-use.h"
+#include "sp-item-group.h"
 #include "sp-namedview.h"
 #include "live_effects/lpe-powerstroke.h"
 #include "style.h"
@@ -432,7 +433,7 @@ static void spdc_check_for_and_apply_waiting_LPE(FreehandBase *dc, SPItem *item,
                 if(cm->paste(SP_ACTIVE_DESKTOP,true) == true){
                     gchar const *svgd = item->getRepr()->attribute("d");
                     bend_item = dc->selection->singleItem();
-                    if(bend_item){
+                    if(bend_item && (SP_IS_SHAPE(bend_item) || SP_IS_GROUP(bend_item))){
                         bend_item->moveTo(item,false);
                         bend_item->transform.setTranslation(Geom::Point());
                         spdc_apply_bend_shape(svgd, dc, bend_item);
@@ -440,9 +441,11 @@ static void spdc_check_for_and_apply_waiting_LPE(FreehandBase *dc, SPItem *item,
 
                         shape = BEND_CLIPBOARD;
                     } else {
+                        bend_item = NULL;
                         shape = NONE;
                     }
                 } else {
+                    bend_item = NULL;
                     shape = NONE;
                 }
                 break;