summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJohn Smith <john.smith7545@yahoo.com>2012-10-11 14:23:48 +0000
committerJohn Smith <john.smith7545@yahoo.com>2012-10-11 14:23:48 +0000
commit756e60863f9997fc95365a21937b9ac402709441 (patch)
tree82fc135e5207f0ca6bf5050f3f9bd8a47bfe4a04 /src
parentUpdate default keymap to include most of the new verbsadded in trunk, sync in... (diff)
downloadinkscape-756e60863f9997fc95365a21937b9ac402709441.tar.gz
inkscape-756e60863f9997fc95365a21937b9ac402709441.zip
Fix for 1058402 : Inconsistent opacity indication
(bzr r11781)
Diffstat (limited to 'src')
-rw-r--r--src/ui/widget/style-swatch.cpp7
-rw-r--r--src/widgets/widget-sizes.h2
2 files changed, 3 insertions, 6 deletions
diff --git a/src/ui/widget/style-swatch.cpp b/src/ui/widget/style-swatch.cpp
index 857ae7019..60d5f6ecc 100644
--- a/src/ui/widget/style-swatch.cpp
+++ b/src/ui/widget/style-swatch.cpp
@@ -340,15 +340,12 @@ void StyleSwatch::setStyle(SPStyle *query)
if (op != 1) {
{
gchar *str;
- if (op == 0)
- str = g_strdup_printf(_("O:%.3g"), op);
- else
- str = g_strdup_printf(_("O:.%d"), (int) (op*10));
+ str = g_strdup_printf(_("O: %2.0f"), (op*100.0));
_opacity_value.set_markup (str);
g_free (str);
}
{
- gchar *str = g_strdup_printf(_("Opacity: %.3g"), op);
+ gchar *str = g_strdup_printf(_("Opacity: %2.1f %%"), (op*100.0));
_opacity_place.set_tooltip_text(str);
g_free (str);
}
diff --git a/src/widgets/widget-sizes.h b/src/widgets/widget-sizes.h
index 7de251ee6..fe89d4574 100644
--- a/src/widgets/widget-sizes.h
+++ b/src/widgets/widget-sizes.h
@@ -31,7 +31,7 @@
#define SELECTED_STYLE_SB_WIDTH 48
#define SELECTED_STYLE_WIDTH 190
-#define STYLE_SWATCH_WIDTH 130
+#define STYLE_SWATCH_WIDTH 135
#define STATUS_LAYER_FONT_SIZE 7700