From 71458465fb8140b9fd3c06871014138b16fd6de5 Mon Sep 17 00:00:00 2001
From: Hannes Janetzek <hannes.janetzek@gmail.com>
Date: Fri, 6 Mar 2009 01:56:09 +0000
Subject: [PATCH] shelf: fixed size of style selector, better fitting var name

SVN revision: 39386
---
 src/bin/e_int_shelf_config.c |  4 ++--
 src/bin/e_shelf.c            | 16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/bin/e_int_shelf_config.c b/src/bin/e_int_shelf_config.c
index d00522cfa..b9ebe84ae 100644
--- a/src/bin/e_int_shelf_config.c
+++ b/src/bin/e_int_shelf_config.c
@@ -624,14 +624,14 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
 	  sel = n;
      }
    e_widget_min_size_get(oi, &wmw, &wmh);
-   e_widget_min_size_set(oi, wmw, 120);
+   e_widget_min_size_set(oi, wmw, 160);
    
    e_widget_ilist_go(oi);
    e_widget_ilist_selected_set(oi, sel);
    
    e_widget_framelist_object_append(of, oi);
    
-   e_widget_list_object_append(o2, of, 0, 0, 0.5);
+   e_widget_list_object_append(o2, of, 1, 1, 0.5);
    
    ob = e_widget_button_add(evas, _("Configure Contents..."), "widget/config", _cb_configure, cfdata, NULL);
    e_widget_list_object_append(o2, ob, 0, 0, 0.5);
diff --git a/src/bin/e_shelf.c b/src/bin/e_shelf.c
index 11eace7b5..30f80ec2e 100644
--- a/src/bin/e_shelf.c
+++ b/src/bin/e_shelf.c
@@ -1396,9 +1396,10 @@ static int
 _e_shelf_cb_hide_animator(void *data)
 {
    E_Shelf *es;
-   int step, hidden_size;
+   int step, hide_max;
    
    es = data;
+
    switch (es->gadcon->orient)
      {
       case E_GADCON_ORIENT_TOP:
@@ -1407,7 +1408,7 @@ _e_shelf_cb_hide_animator(void *data)
       case E_GADCON_ORIENT_BOTTOM:
       case E_GADCON_ORIENT_CORNER_BL:
       case E_GADCON_ORIENT_CORNER_BR:
-	 hidden_size = es->h - es->hidden_state_size;
+	 hide_max = es->h - es->hidden_state_size;
 	 if (es->hide_origin == -1)
 	   es->hide_origin = es->y;	 
 	 break;
@@ -1417,23 +1418,22 @@ _e_shelf_cb_hide_animator(void *data)
       case E_GADCON_ORIENT_RIGHT:
       case E_GADCON_ORIENT_CORNER_RB:
       case E_GADCON_ORIENT_CORNER_RT:
-	 hidden_size = es->w - es->hidden_state_size;
+	 hide_max = es->w - es->hidden_state_size;
 	 if (es->hide_origin == -1)
 	   es->hide_origin = es->x;
 	 break;
      }
 
-   step = (hidden_size / e_config->framerate) / es->cfg->hide_duration;
-
+   step = (hide_max / e_config->framerate) / es->cfg->hide_duration;
    if (!step) step = 1;
 
    if (es->hidden)
      {
-	if (es->hide_step < hidden_size)
+	if (es->hide_step < hide_max)
 	  {
-	     if (es->hide_step + step > hidden_size)
+	     if (es->hide_step + step > hide_max)
 	       {
-		  es->hide_step = hidden_size;
+		  es->hide_step = hide_max;
 	       }
 	     else
 	       {