diff options
| author | Marco Pesenti Gritti <mpg@redhat.com> | 2007-03-21 16:23:12 (GMT) |
|---|---|---|
| committer | Marco Pesenti Gritti <mpg@redhat.com> | 2007-03-21 16:23:12 (GMT) |
| commit | c49c8150d210fd58ca0d3446cedf00b57d277891 (patch) | |
| tree | 5252b151f858cc5b3c9f1be761441f6cfff41e5b | |
| parent | 0dfec679d7976525f2ceca4d0feef32159625682 (diff) | |
| parent | 8840122a22a98ecf298d69337e76e3ed1d672edf (diff) | |
Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar
| -rw-r--r-- | lib/data/gecko-prefs.js | 5 | ||||
| -rw-r--r-- | lib/src/sugar-address-entry.c | 5 |
2 files changed, 3 insertions, 7 deletions
diff --git a/lib/data/gecko-prefs.js b/lib/data/gecko-prefs.js index cbbcfc1..ee61382 100644 --- a/lib/data/gecko-prefs.js +++ b/lib/data/gecko-prefs.js @@ -33,11 +33,6 @@ user_pref("font.size.unit", "pt"); user_pref("layout.css.dpi", 134); -user_pref("font.name.cursive.ar", "KacstQurn"); -user_pref("font.name.fantasy.ar", "KacstDecorative"); -user_pref("font.name.monospace.ar", "KacstDigital"); -user_pref("font.name.sans-serif.ar", "KacstQurn"); -user_pref("font.name.serif.ar", "KacstBook"); user_pref("font.default.ar", "sans-serif"); user_pref("font.size.variable.ar", 12); user_pref("font.size.fixed.ar", 9); diff --git a/lib/src/sugar-address-entry.c b/lib/src/sugar-address-entry.c index 68fab0a..07f2d13 100644 --- a/lib/src/sugar-address-entry.c +++ b/lib/src/sugar-address-entry.c @@ -456,9 +456,10 @@ sugar_address_entry_expose(GtkWidget *widget, 0, 0, area_width, area_height); */ - if (address_entry->progress != 0.0 && address_entry->progress != 1.0) { + if (address_entry->progress != 0.0 && address_entry->progress != 1.0 && + !GTK_WIDGET_HAS_FOCUS(entry)) { int bar_width = area_width * address_entry->progress; - float radius = 5.0; + float radius = area_height / 2; cr = gdk_cairo_create(entry->text_area); cairo_set_source_rgb(cr, 0.0, 0.0, 0.0); |