Enlightenment CVS committal

Author  : andrunko
Project : e17
Module  : libs/etk

Dir     : e17/libs/etk/src/lib


Modified Files:
        etk_mdi_window.c etk_mdi_window.h 


Log Message:
Added support to disable decoration and resize from resize handle.

===================================================================
RCS file: /cvs/e/e17/libs/etk/src/lib/etk_mdi_window.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- etk_mdi_window.c    31 Jul 2007 16:49:47 -0000      1.3
+++ etk_mdi_window.c    15 Aug 2007 23:02:21 -0000      1.4
@@ -30,7 +30,10 @@
 enum Etk_Mdi_Window_Property_Id
 {
    ETK_MDI_WINDOW_TITLE_PROPERTY,
-   ETK_MDI_WINDOW_MAXIMIZED_PROPERTY
+   ETK_MDI_WINDOW_MAXIMIZED_PROPERTY,
+   ETK_MDI_WINDOW_DRAGGABLE_PROPERTY,
+   ETK_MDI_WINDOW_RESIZABLE_PROPERTY,
+   ETK_MDI_WINDOW_DECORATED_PROPERTY
 };
 
 static void _etk_mdi_window_constructor(Etk_Mdi_Window *mdi_window);
@@ -81,6 +84,12 @@
          ETK_PROPERTY_STRING, ETK_PROPERTY_READABLE_WRITABLE, 
etk_property_value_string(NULL));
       etk_type_property_add(mdi_window_type, "maximized", 
ETK_MDI_WINDOW_MAXIMIZED_PROPERTY,
          ETK_PROPERTY_BOOL, ETK_PROPERTY_READABLE_WRITABLE, 
etk_property_value_bool(ETK_FALSE));
+      etk_type_property_add(mdi_window_type, "draggable", 
ETK_MDI_WINDOW_DRAGGABLE_PROPERTY,
+         ETK_PROPERTY_BOOL, ETK_PROPERTY_READABLE_WRITABLE, 
etk_property_value_bool(ETK_TRUE));
+      etk_type_property_add(mdi_window_type, "resizable", 
ETK_MDI_WINDOW_RESIZABLE_PROPERTY,
+         ETK_PROPERTY_BOOL, ETK_PROPERTY_READABLE_WRITABLE, 
etk_property_value_bool(ETK_TRUE));
+      etk_type_property_add(mdi_window_type, "decorated", 
ETK_MDI_WINDOW_DECORATED_PROPERTY,
+         ETK_PROPERTY_BOOL, ETK_PROPERTY_READABLE_WRITABLE, 
etk_property_value_bool(ETK_TRUE));
 
       mdi_window_type->property_set = _etk_mdi_window_property_set;
       mdi_window_type->property_get = _etk_mdi_window_property_get;
@@ -191,6 +200,96 @@
 
    return mdi_window->maximized;
 }
+
+/**
+ * @brief Sets whether or not the mdi_window is draggable
+ * @param mdi_window a mdi_window
+ * @param draggable ETK_TRUE to enable drag on the mdi_window, ETK_FALSE 
otherwise
+ */
+void etk_mdi_window_draggable_set(Etk_Mdi_Window *mdi_window, Etk_Bool 
draggable)
+{
+   if (!mdi_window || mdi_window->draggable == draggable)
+      return;
+
+   mdi_window->dragging = ETK_FALSE;
+   mdi_window->draggable = draggable;
+   etk_object_notify(ETK_OBJECT(mdi_window), "draggable");
+}
+
+/**
+ * @brief Gets whether the mdi_window is draggable
+ * @param mdi_window a mdi_window
+ * @return Returns ETK_TRUE if the mdi_window is draggable, ETK_FALSE otherwise
+ */
+Etk_Bool etk_mdi_window_draggable_get(Etk_Mdi_Window *mdi_window)
+{
+   if (!mdi_window)
+      return ETK_FALSE;
+
+   return mdi_window->draggable;
+}
+
+/**
+ * @brief Sets whether or not the mdi_window is draggable
+ * @param mdi_window a mdi_window
+ * @param resizable ETK_TRUE to enable resize on the mdi_window, ETK_FALSE 
otherwise
+ */
+void etk_mdi_window_resizable_set(Etk_Mdi_Window *mdi_window, Etk_Bool 
resizable)
+{
+   if (!mdi_window || mdi_window->resizable == resizable)
+      return;
+
+   mdi_window->resizing = ETK_FALSE;
+   mdi_window->resizable = resizable;
+   /* make sure the pointer is correct */
+   // 
etk_toplevel_pointer_pop(etk_widget_toplevel_parent_get(ETK_WIDGET(mdi_window)),
 ETK_POINTER_RESIZE_BR);
+   etk_object_notify(ETK_OBJECT(mdi_window), "resizable");
+}
+
+/**
+ * @brief Gets whether the mdi_window is resizable
+ * @param mdi_window a mdi_window
+ * @return Returns ETK_TRUE if the mdi_window is resizable, ETK_FALSE otherwise
+ */
+Etk_Bool etk_mdi_window_resizable_get(Etk_Mdi_Window *mdi_window)
+{
+   if (!mdi_window)
+      return ETK_FALSE;
+
+   return mdi_window->resizable;
+}
+
+/**
+ * @brief Sets whether or not the mdi_window is decorated
+ * @param mdi_window a mdi_window
+ * @param decorated ETK_TRUE to enable decoration on the mdi_window, ETK_FALSE 
otherwise
+ */
+void etk_mdi_window_decorated_set(Etk_Mdi_Window *mdi_window, Etk_Bool 
decorated)
+{
+   if (!mdi_window || mdi_window->decorated == decorated)
+      return;
+
+   mdi_window->decorated = decorated;
+   if (decorated)
+      etk_widget_theme_group_set(ETK_WIDGET(mdi_window), "mdi_window");
+   else
+      etk_widget_theme_group_set(ETK_WIDGET(mdi_window), 
"mdi_window_borderless");
+   etk_object_notify(ETK_OBJECT(mdi_window), "decorated");
+}
+
+/**
+ * @brief Gets whether the mdi_window is decorated
+ * @param mdi_window a mdi_window
+ * @return Returns ETK_TRUE if the mdi_window is decorated, ETK_FALSE otherwise
+ */
+Etk_Bool etk_mdi_window_decorated_get(Etk_Mdi_Window *mdi_window)
+{
+   if (!mdi_window)
+      return ETK_FALSE;
+
+   return mdi_window->decorated;
+}
+
 /**
  * @brief A utility function to use as a callback for the "delete-event" 
signal.
  * It will hide the mdi_window and return ETK_TRUE to prevent the program from 
quitting
@@ -221,6 +320,10 @@
 
    mdi_window->title = NULL;
    mdi_window->maximized = ETK_FALSE;
+   mdi_window->draggable = ETK_TRUE;
+   mdi_window->resizable = ETK_TRUE;
+   mdi_window->decorated = ETK_TRUE;
+   /* mdi_window->decorations = ETK_MDI_WINDOW_WM_DECORATION_ALL; */
    mdi_window->dragging = ETK_FALSE;
    mdi_window->resizing = ETK_FALSE;
 
@@ -254,6 +357,15 @@
       case ETK_MDI_WINDOW_MAXIMIZED_PROPERTY:
          etk_mdi_window_maximized_set(mdi_window, 
etk_property_value_bool_get(value));
          break;
+      case ETK_MDI_WINDOW_DRAGGABLE_PROPERTY:
+         etk_mdi_window_draggable_set(mdi_window, 
etk_property_value_bool_get(value));
+         break;
+      case ETK_MDI_WINDOW_RESIZABLE_PROPERTY:
+         etk_mdi_window_resizable_set(mdi_window, 
etk_property_value_bool_get(value));
+         break;
+      case ETK_MDI_WINDOW_DECORATED_PROPERTY:
+         etk_mdi_window_decorated_set(mdi_window, 
etk_property_value_bool_get(value));
+         break;
       default:
          break;
    }
@@ -273,7 +385,16 @@
          etk_property_value_string_set(value, mdi_window->title);
          break;
       case ETK_MDI_WINDOW_MAXIMIZED_PROPERTY:
-         etk_property_value_bool_set(value, 
etk_mdi_window_maximized_get(mdi_window));
+         etk_property_value_bool_set(value, mdi_window->maximized);
+         break;
+      case ETK_MDI_WINDOW_DRAGGABLE_PROPERTY:
+         etk_property_value_bool_set(value, mdi_window->draggable);
+         break;
+      case ETK_MDI_WINDOW_RESIZABLE_PROPERTY:
+         etk_property_value_bool_set(value, mdi_window->resizable);
+         break;
+      case ETK_MDI_WINDOW_DECORATED_PROPERTY:
+         etk_property_value_bool_set(value, mdi_window->decorated);
          break;
       default:
          break;
@@ -328,7 +449,7 @@
    Etk_Mdi_Window *mdi_window;
    Evas_Event_Mouse_Down *ev;
 
-   if (!(mdi_window = ETK_MDI_WINDOW(data)))
+   if (!(mdi_window = ETK_MDI_WINDOW(data)) || !mdi_window->draggable)
       return;
 
    ev = event_info;
@@ -363,7 +484,7 @@
    Etk_Mdi_Window *mdi_window;
    Evas_Event_Mouse_Move *ev;
 
-   if (!(mdi_window = ETK_MDI_WINDOW(data)) || !(mdi_window->dragging))
+   if (!(mdi_window = ETK_MDI_WINDOW(data)) || !mdi_window->dragging)
       return;
 
    ev = event_info;
@@ -378,7 +499,7 @@
 {
    Etk_Mdi_Window *mdi_window;
 
-   if (!(mdi_window = ETK_MDI_WINDOW(data)) || mdi_window->maximized)
+   if (!(mdi_window = ETK_MDI_WINDOW(data)) || mdi_window->maximized || 
!mdi_window->resizable)
       return;
 
    
etk_toplevel_pointer_push(etk_widget_toplevel_parent_get(ETK_WIDGET(mdi_window)),
 ETK_POINTER_RESIZE_BR);
@@ -402,7 +523,7 @@
    Evas_Event_Mouse_Down *ev;
    int w, h;
 
-   if (!(mdi_window = ETK_MDI_WINDOW(data)) || mdi_window->maximized)
+   if (!(mdi_window = ETK_MDI_WINDOW(data)) || mdi_window->maximized || 
!mdi_window->resizable)
       return;
 
    ev = event_info;
@@ -428,7 +549,7 @@
    Etk_Mdi_Window *mdi_window;
    Evas_Event_Mouse_Move *ev;
 
-   if (!(mdi_window = ETK_MDI_WINDOW(data)) || !(mdi_window->resizing))
+   if (!(mdi_window = ETK_MDI_WINDOW(data)) || !mdi_window->resizing)
       return;
 
    ev = event_info;
@@ -491,4 +612,22 @@
  * @prop_type String (char *)
  * @prop_rw
  * @prop_val NULL
+ * \par
+ * @prop_name "maximized": Whether or not the mdi_window is maximized
+ * @prop_type Boolean
+ * @prop_rw
+ * @prop_val ETK_FALSE
+ * \par
+ * @prop_name "draggable": Whether or not the mdi_window is draggable
+ * @prop_type Boolean
+ * @prop_rw
+ * @prop_val ETK_TRUE
+ * @prop_name "resizable": Whether or not the mdi_window is resizable
+ * @prop_type Boolean
+ * @prop_rw
+ * @prop_val ETK_TRUE
+ * @prop_name "decorated": Whether or not the mdi_window is decorated
+ * @prop_type Boolean
+ * @prop_rw
+ * @prop_val ETK_TRUE
  */
===================================================================
RCS file: /cvs/e/e17/libs/etk/src/lib/etk_mdi_window.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- etk_mdi_window.h    31 Jul 2007 16:49:47 -0000      1.4
+++ etk_mdi_window.h    15 Aug 2007 23:02:21 -0000      1.5
@@ -20,6 +20,18 @@
 
 typedef struct Etk_Mdi_Window_Data Etk_Mdi_Window_Data;
 
+/*
+typedef enum
+{
+   ETK_MDI_WINDOW_WM_DECORATION_NONE = 1 << 0,
+   ETK_MDI_WINDOW_WM_DECORATION_MINIMIZE = 1 << 1,
+   ETK_MDI_WINDOW_WM_DECORATION_MAXIMIZE = 1 << 2,
+   ETK_MDI_WINDOW_WM_DECORATION_CLOSE = 1 << 3,
+   ETK_MDI_WINDOW_WM_DECORATION_ALL =
+      ETK_MDI_WINDOW_WM_DECORATION_MINIMIZE | 
ETK_MDI_WINDOW_WM_DECORATION_MAXIMIZE | ETK_MDI_WINDOW_WM_DECORATION_CLOSE
+} Etk_Mdi_Window_WM_Decoration;
+*/
+
 /**
  * @brief @widget A widget in a mdi area
  * @structinfo
@@ -34,6 +46,10 @@
 
    char *title;
    Etk_Bool maximized;
+   Etk_Bool draggable;
+   Etk_Bool resizable;
+   Etk_Bool decorated;
+   /* Etk_Mdi_Window_WM_Decoration decorations; */
    Etk_Bool dragging;
    int drag_offset_x;
    int drag_offset_y;
@@ -59,9 +75,18 @@
 void        etk_mdi_window_maximized_set(Etk_Mdi_Window *mdi_window, Etk_Bool 
maximized);
 Etk_Bool    etk_mdi_window_maximized_get(Etk_Mdi_Window *mdi_window);
 
-/*
+void        etk_mdi_window_draggable_set(Etk_Mdi_Window *mdi_window, Etk_Bool 
draggable);
+Etk_Bool    etk_mdi_window_draggable_get(Etk_Mdi_Window *mdi_window);
+
+void        etk_mdi_window_resizable_set(Etk_Mdi_Window *mdi_window, Etk_Bool 
resizable);
+Etk_Bool    etk_mdi_window_resizable_get(Etk_Mdi_Window *mdi_window);
+
 void        etk_mdi_window_decorated_set(Etk_Mdi_Window *mdi_window, Etk_Bool 
decorated);
 Etk_Bool    etk_mdi_window_decorated_get(Etk_Mdi_Window *mdi_window);
+
+/*
+void        etk_mdi_window_decorations_set(Etk_Mdi_Window *mdi_window, 
Etk_Mdi_Window_WM_Decoration decorations);
+Etk_Mdi_Window_WM_Decoration etk_mdi_window_decorations_get(Etk_Mdi_Window 
*mdi_window);
 */
 
 Etk_Bool    etk_mdi_window_hide_on_delete(Etk_Object *mdi_window, void *data);



-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems?  Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >>  http://get.splunk.com/
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to