Tweaked the zoom control specifications to match the new nicer rules.

	* icons/crux_eggplant/crux_eggplant.xml:
	* icons/crux_teal/crux_teal.xml:
	* icons/default/default.xml:
	* icons/gnome/gnome.xml:
	* icons/sierra/sierra.xml:
	* icons/tahoe/tahoe.xml:
	Tweaked the zoom control specifications to match the new nicer
	rules.

	* src/nautilus-zoom-control.c: (draw_number):
	Removed a lot of strangeness and fudge factors from this function.

6 files changed, 7 insertions, 8 deletions

diff --git a/icons/crux_eggplant/crux_eggplant.xml b/icons/crux_eggplant/crux_eggplant.xml
index b9aab8c6f..f4ec05a70 100644
--- a/icons/crux_eggplant/crux_eggplant.xml
+++ b/icons/crux_eggplant/crux_eggplant.xml
@@ -15,6 +15,5 @@
            tab_font="Helvetica Bold" />
 
   <desktop background_tile_image="./backgrounds/background_pattern.png"/>
-  <zoom_control number_v_offset="-6" number_h_offset="0" digit_width="6"/>
   <throbber frame_count="30" url="http://www.eazel.com"/>
 </theme>
diff --git a/icons/crux_teal/crux_teal.xml b/icons/crux_teal/crux_teal.xml
index 100e2389c..4197c7669 100644
--- a/icons/crux_teal/crux_teal.xml
+++ b/icons/crux_teal/crux_teal.xml
@@ -13,6 +13,5 @@
            tab_font="Helvetica Bold" />
            
   <desktop background_tile_image="./backgrounds/background_pattern.png" />
-  <zoom_control number_v_offset="-6" number_h_offset="0" digit_width="6"/>
   <throbber frame_count="30" url="http://www.eazel.com"/>
 </theme>
diff --git a/icons/default/default.xml b/icons/default/default.xml
index a16a13449..236b27cb5 100644
--- a/icons/default/default.xml
+++ b/icons/default/default.xml
@@ -19,9 +19,7 @@
        text_fill_color="#FFFFFF"/>
   
  <thumbnails frame_offsets="3,3,6,6"/>
-  
  <throbber frame_count="30" url="http://www.eazel.com" delay="75"/>
-  
- <zoom_control number_v_offset="-6" number_h_offset="-2" digit_width="6"/>
+ <zoom_control number_v_offset="-2" number_h_offset="-2"/>
  
 </theme>
diff --git a/icons/gnome/gnome.xml b/icons/gnome/gnome.xml
index 52073793f..943439cc7 100644
--- a/icons/gnome/gnome.xml
+++ b/icons/gnome/gnome.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0"?>
+
 <theme _name="GNOME" _description="A theme designed to fit well with the classic GNOME environment."> 
 
   <directory background_tile_image="patterns/gnome.jpg" 
@@ -22,4 +23,6 @@
   <thumbnails frame_offsets="3,3,6,6"/>
   <toolbar icon_theme="standard"/>
   <throbber frame_count="15" url="http://www.gnome.org"/>
- </theme>
+  <zoom_control number_v_offset="-2" number_h_offset="-2"/>
+
+</theme>
diff --git a/icons/sierra/sierra.xml b/icons/sierra/sierra.xml
index db618800e..5ed14811b 100644
--- a/icons/sierra/sierra.xml
+++ b/icons/sierra/sierra.xml
@@ -3,5 +3,5 @@
   <sidebar sidebar_background_tile_image="./green_weave.png" sidebar_background_color="#FFFFFF" tab_piece_images="none"/>
   <directory background_color="#BAC5C0" selection_box_color_rgba="0x70818359" selection_box_color="#708183"/>
   <desktop background_tile_image="./Sierra_desktop.png" background_color="#FFFFFF"/>
-  <zoom_control number_v_offset="-6" digit_width="6"/>
+  <zoom_control number_v_offset="-2" number_h_offset="-2"/>
 </theme>
diff --git a/icons/tahoe/tahoe.xml b/icons/tahoe/tahoe.xml
index 8bea978eb..be6afe0dd 100644
--- a/icons/tahoe/tahoe.xml
+++ b/icons/tahoe/tahoe.xml
@@ -3,5 +3,5 @@
   <sidebar sidebar_background_tile_image="./bluewall.png" sidebar_background_color="#FFFFFF" title_color="#000000" title_shadow_color="#BBBBBB" title_info_color="#000000"/>
   <directory background_tile_image="./blueridge.png" background_color="#FFFFFF"/>
   <desktop background_tile_image="patterns/fleur_de_lis.png" background_color="#FFFFFF"/>
-  <zoom_control number_v_offset="-6" digit_width="6"/>
+  <zoom_control number_v_offset="-2" number_h_offset="-2"/>
 </theme>