Enlightenment CVS committal

Author  : moom16
Project : e17
Module  : proto

Dir     : e17/proto/etk/src/lib


Modified Files:
        etk_scrolled_view.c etk_scrolled_view.h etk_types.h 


Log Message:
* Add policies to the scrolled view to determine if the scrollbars 
should appear


===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/lib/etk_scrolled_view.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- etk_scrolled_view.c 31 Oct 2005 21:44:33 -0000      1.1
+++ etk_scrolled_view.c 31 Oct 2005 23:45:32 -0000      1.2
@@ -14,7 +14,8 @@
 
 enum _Etk_Scrolled_View_Property_Id
 {
-   ETK_SCROLLED_VIEW_POLICY_PROPERTY
+   ETK_SCROLLED_VIEW_HPOLICY_PROPERTY,
+   ETK_SCROLLED_VIEW_VPOLICY_PROPERTY
 };
 
 static void _etk_scrolled_view_constructor(Etk_Scrolled_View *scrolled_view);
@@ -44,7 +45,8 @@
    {
       scrolled_view_type = etk_type_new("Etk_Scrolled_View", ETK_BIN_TYPE, 
sizeof(Etk_Scrolled_View), ETK_CONSTRUCTOR(_etk_scrolled_view_constructor), 
ETK_DESTRUCTOR(_etk_scrolled_view_destructor), NULL);
 
-      etk_type_property_add(scrolled_view_type, "policy", 
ETK_SCROLLED_VIEW_POLICY_PROPERTY, ETK_PROPERTY_INT, 
ETK_PROPERTY_READABLE_WRITABLE, etk_property_value_int(0));
+      etk_type_property_add(scrolled_view_type, "hpolicy", 
ETK_SCROLLED_VIEW_HPOLICY_PROPERTY, ETK_PROPERTY_INT, 
ETK_PROPERTY_READABLE_WRITABLE, etk_property_value_int(ETK_POLICY_AUTO));
+      etk_type_property_add(scrolled_view_type, "vpolicy", 
ETK_SCROLLED_VIEW_VPOLICY_PROPERTY, ETK_PROPERTY_INT, 
ETK_PROPERTY_READABLE_WRITABLE, etk_property_value_int(ETK_POLICY_AUTO));
       
       scrolled_view_type->property_set = _etk_scrolled_view_property_set;
       scrolled_view_type->property_get = _etk_scrolled_view_property_get;
@@ -111,6 +113,51 @@
    etk_container_add(ETK_CONTAINER(viewport), child);
 }
 
+/**
+ * @brief Sets the policy of the hscrollbar and the vscrollbar of the scrolled 
view. @n
+ * A policy describes when a scrollbar should appear: ETK_POLICY_SHOW always 
shows the scrollbar, @n
+ * ETK_POLICY_HIDE always hides the scrollbar, and ETK_POLICY_AUTO determines 
automatically if the scrollbar should appear
+ * @param scrolled_view a scrolled view
+ * @param hpolicy the policy to set for the hscrollbar
+ * @param vpolicy the policy to set for the vscrollbar
+ */
+void etk_scrolled_view_policy_set(Etk_Scrolled_View *scrolled_view, 
Etk_Scrolled_View_Policy hpolicy, Etk_Scrolled_View_Policy vpolicy)
+{
+   if (!scrolled_view)
+      return;
+
+   if (scrolled_view->hpolicy != hpolicy)
+   {
+      scrolled_view->hpolicy = hpolicy;
+      etk_object_notify(ETK_OBJECT(scrolled_view), "hpolicy");
+      etk_widget_redraw_queue(ETK_WIDGET(scrolled_view));
+   }
+   if (scrolled_view->vpolicy != vpolicy)
+   {
+      scrolled_view->vpolicy = vpolicy;
+      etk_object_notify(ETK_OBJECT(scrolled_view), "vpolicy");
+      etk_widget_redraw_queue(ETK_WIDGET(scrolled_view));
+   }
+}
+
+/**
+ * @brief Fets the policy of the hscrollbar and the vscrollbar of the scrolled 
view
+ * @param scrolled_view a scrolled view
+ * @param hpolicy the location where to set the policy of the hscrollbar
+ * @param vpolicy the location where to set the policy of the vscrollbar
+ */
+void etk_scrolled_view_policy_get(Etk_Scrolled_View *scrolled_view, 
Etk_Scrolled_View_Policy *hpolicy, Etk_Scrolled_View_Policy *vpolicy)
+{
+   if (!scrolled_view)
+      return;
+   
+   if (hpolicy)
+      *hpolicy = scrolled_view->hpolicy;
+   if (vpolicy)
+      *vpolicy = scrolled_view->vpolicy;
+}
+
+
 /**************************
  *
  * Etk specific functions
@@ -123,6 +170,9 @@
    if (!scrolled_view)
       return;
 
+   scrolled_view->hpolicy = ETK_POLICY_AUTO;
+   scrolled_view->vpolicy = ETK_POLICY_AUTO;
+
    scrolled_view->hscrollbar = etk_hscrollbar_new(0.0, 0.0, 0.0, 6.0, 40.0, 
0.0);
    etk_widget_parent_set(scrolled_view->hscrollbar, 
ETK_CONTAINER(scrolled_view));
    etk_widget_show(scrolled_view->hscrollbar);
@@ -159,8 +209,11 @@
 
    switch (property_id)
    {
-      /* TODO */
-      case ETK_SCROLLED_VIEW_POLICY_PROPERTY:
+      case ETK_SCROLLED_VIEW_HPOLICY_PROPERTY:
+         etk_scrolled_view_policy_set(scrolled_view, 
etk_property_value_int_get(value), scrolled_view->vpolicy);
+         break;
+      case ETK_SCROLLED_VIEW_VPOLICY_PROPERTY:
+         etk_scrolled_view_policy_set(scrolled_view, scrolled_view->hpolicy, 
etk_property_value_int_get(value));
          break;
       default:
          break;
@@ -177,8 +230,11 @@
 
    switch (property_id)
    {
-      /* TODO */
-      case ETK_SCROLLED_VIEW_POLICY_PROPERTY:
+      case ETK_SCROLLED_VIEW_HPOLICY_PROPERTY:
+         etk_property_value_int_set(value, scrolled_view->hpolicy);
+         break;
+      case ETK_SCROLLED_VIEW_VPOLICY_PROPERTY:
+         etk_property_value_int_set(value, scrolled_view->vpolicy);
          break;
       default:
          break;
@@ -230,16 +286,19 @@
       return;
    }
 
-   etk_widget_size_request_full(scrolled_view->hscrollbar, 
&hscrollbar_requisition, FALSE);
-   etk_widget_size_request_full(scrolled_view->vscrollbar, 
&vscrollbar_requisition, FALSE);
+   if (scrolled_view->hpolicy == ETK_POLICY_AUTO || scrolled_view->hpolicy == 
ETK_POLICY_SHOW)
+      etk_widget_size_request_full(scrolled_view->hscrollbar, 
&hscrollbar_requisition, FALSE);
+   if (scrolled_view->vpolicy == ETK_POLICY_AUTO || scrolled_view->vpolicy == 
ETK_POLICY_SHOW)
+      etk_widget_size_request_full(scrolled_view->vscrollbar, 
&vscrollbar_requisition, FALSE);
    child->scroll_size_get(child, &scroll_size);
 
-   if (scroll_size.w > geometry.w)
+   if ((scrolled_view->hpolicy == ETK_POLICY_AUTO && scroll_size.w > 
geometry.w) || scrolled_view->hpolicy == ETK_POLICY_SHOW)
       show_hscrollbar = TRUE;
-   if (scroll_size.h > (geometry.h - (show_hscrollbar ? 
hscrollbar_requisition.h : 0)))
+   if ((scrolled_view->vpolicy == ETK_POLICY_AUTO && scroll_size.h > 
(geometry.h - (show_hscrollbar ? hscrollbar_requisition.h : 0))) ||
+      scrolled_view->vpolicy == ETK_POLICY_SHOW)
    {
       show_vscrollbar = TRUE;
-      if (scroll_size.w > (geometry.w - vscrollbar_requisition.w))
+      if (scrolled_view->hpolicy == ETK_POLICY_AUTO && scroll_size.w > 
(geometry.w - vscrollbar_requisition.w))
          show_hscrollbar = TRUE;
    }
 
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/lib/etk_scrolled_view.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- etk_scrolled_view.h 31 Oct 2005 21:44:33 -0000      1.1
+++ etk_scrolled_view.h 31 Oct 2005 23:45:32 -0000      1.2
@@ -19,8 +19,20 @@
 #define ETK_IS_SCROLLED_VIEW(obj)    (ETK_OBJECT_CHECK_TYPE((obj), 
ETK_SCROLLED_VIEW_TYPE))
 
 /**
+ * @enum Etk_Scrolled_View_Policy
+ * @struct An Etk_Scrolled_View_Policy describes if the scrollbar should be 
always visible, always hidden, @n
+ * or if it should be shown/hidden automatically
+ */
+enum _Etk_Scrolled_View_Policy
+{
+   ETK_POLICY_SHOW,
+   ETK_POLICY_HIDE,
+   ETK_POLICY_AUTO
+};
+
+/**
  * @struct Etk_Scrolled_View
- * @brief A scrolled_view is a bin container that have a label. It's useful to 
group some widgets that need to be together
+ * @brief A scrolled_view is a bin container which has two scrollbars and 
allows to scroll the child
  */
 struct _Etk_Scrolled_View
 {
@@ -30,6 +42,9 @@
 
    Etk_Widget *hscrollbar;
    Etk_Widget *vscrollbar;
+
+   Etk_Scrolled_View_Policy hpolicy;
+   Etk_Scrolled_View_Policy vpolicy;
 };
 
 Etk_Type *etk_scrolled_view_type_get();
@@ -40,6 +55,9 @@
 
 void etk_scrolled_view_add_with_viewport(Etk_Scrolled_View *scrolled_view, 
Etk_Widget *child);
 
+void etk_scrolled_view_policy_set(Etk_Scrolled_View *scrolled_view, 
Etk_Scrolled_View_Policy hpolicy, Etk_Scrolled_View_Policy vpolicy);
+void etk_scrolled_view_policy_get(Etk_Scrolled_View *scrolled_view, 
Etk_Scrolled_View_Policy *hpolicy, Etk_Scrolled_View_Policy *vpolicy);
+
 /** @} */
 
 #endif
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/lib/etk_types.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- etk_types.h 31 Oct 2005 21:36:40 -0000      1.9
+++ etk_types.h 31 Oct 2005 23:45:32 -0000      1.10
@@ -63,6 +63,7 @@
 typedef struct _Etk_Paned Etk_Paned;
 typedef struct _Etk_HPaned Etk_HPaned;
 typedef struct _Etk_VPaned Etk_VPaned;
+typedef enum _Etk_Scrolled_View_Policy Etk_Scrolled_View_Policy;
 typedef struct _Etk_Scrolled_View Etk_Scrolled_View;
 typedef struct _Etk_Viewport Etk_Viewport;
 typedef struct _Etk_Window Etk_Window;




-------------------------------------------------------
This SF.Net email is sponsored by the JBoss Inc.
Get Certified Today * Register for a JBoss Training Course
Free Certification Exam for All Training Attendees Through End of 2005
Visit http://www.jboss.com/services/certification for more information
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to