Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar
This commit is contained in:
		
						commit
						c49c8150d2
					
				| @ -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); | ||||
|  | ||||
| @ -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); | ||||
|  | ||||
		Loading…
	
		Reference in New Issue
	
	Block a user
	 Marco Pesenti Gritti
						Marco Pesenti Gritti