adobe-source-commits

[Foster B. <fos...@us...>]

Update of /cvsroot/adobe-source/sandbox/adobe-source/adobe/future/widgets/headers
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25760/adobe/future/widgets/headers

Modified Files:
	client_assembler.hpp ui_core.hpp 
Added Files:
	label_t.hpp 
Log Message:
the state of things. We've been working to isolate static_text_t (now called label_t) but it has been slow going because we're trying to wrestle with perfecting the API and what effect that has on other components that were using label_t in a way that isn't in accordance with the new API we're trying to write. As it stands static_disabled_text_m is broken on both platforms, but everything else should be working better.

--- NEW FILE: label_t.hpp ---
/*
    Copyright 2005-2006 Adobe Systems Incorporated
    Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt
    or a copy at http://opensource.adobe.com/licenses.html)
*/

/****************************************************************************************************/

#ifndef ADOBE_WIDGET_LABEL_T_HPP
#define ADOBE_WIDGET_LABEL_T_HPP

/****************************************************************************************************/

#include <adobe/config.hpp>
#include <adobe/source/swap.hpp>

// for theme_t
#include <adobe/future/widgets/headers/ui_core.hpp>

#include <boost/operators.hpp>

/****************************************************************************************************/

namespace adobe {

/****************************************************************************************************/

class label_t : boost::equality_comparable<label_t>
{
public:
    label_t(const std::string& name,
            std::size_t        characters,
            theme_t            theme);

#if !defined(ADOBE_NO_DOCUMENTATION)
    label_t(const label_t& rhs);

    ~label_t();

    label_t& operator= (const label_t& rhs);
#endif

    extents_t::slice_t measure_horizontal();
    extents_t::slice_t measure_vertical(const extents_t::slice_t& horizontal);
    void               place(const point_2d_t& position, const extents_t& extents);

    void               enable(bool make_enabled);

    friend bool operator== (const adobe::label_t& x, const adobe::label_t& y);

    friend inline void swap(adobe::label_t& x, adobe::label_t& y)
        { adobe::adl_swap(x.object_m, y.object_m); }

#if !defined(ADOBE_NO_DOCUMENTATION)
    struct implementation_t;

private:
    implementation_t* object_m;

public:
    implementation_t&       implementation();
    const implementation_t& implementation() const;
#endif

};

/****************************************************************************************************/

} // namespace adobe

/****************************************************************************************************/

#endif

/****************************************************************************************************/

Index: client_assembler.hpp
===================================================================
RCS file: /cvsroot/adobe-source/sandbox/adobe-source/adobe/future/widgets/headers/client_assembler.hpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** client_assembler.hpp	3 Feb 2006 18:33:36 -0000	1.9
--- client_assembler.hpp	23 Feb 2006 23:28:55 -0000	1.10
***************
*** 27,30 ****
--- 27,31 ----
  
  #include <boost/function.hpp>
+ #include <boost/filesystem/path.hpp>
  
  #include <list>
***************
*** 98,103 ****
      /// sheet to bind against.
      ///
!     /// \param  directory_path  the directory to look for Eve
!     ///             files referenced by @dialog in.
      /// \param  sheet       the sheet to bind against. This
      ///             sheet should contain all of the
--- 99,106 ----
      /// sheet to bind against.
      ///
!     /// \param  directory_path  the base directory for any
!     ///             external resources that the layout may need
!     ///             to fetch (like external images or other Eve
!     ///             layouts to be used during a @dialog action)
      /// \param  sheet       the sheet to bind against. This
      ///             sheet should contain all of the
***************
*** 106,110 ****
      ///             push_back or @dialog).
      //
!     window_server_t(const char* directory_path, adobe::sheet_t& sheet);
      //
      /// Hide and release all Eve dialogs created by this window server.
--- 109,113 ----
      ///             push_back or @dialog).
      //
!     window_server_t(const boost::filesystem::path& working_directory, adobe::sheet_t& sheet);
      //
      /// Hide and release all Eve dialogs created by this window server.
***************
*** 204,212 ****
      void erase(iterator window);
      
!     adobe::sheet_t&                 sheet_m;
!     std::string                     directory_path_m;
!     window_list_t                   window_list_m;
!     action_fallback_proc_t          fallback_m;
!     adobe::widget_factory_proc_t    widget_factory_m;
  };
  
--- 207,215 ----
      void erase(iterator window);
      
!     adobe::sheet_t&              sheet_m;
!     boost::filesystem::path      directory_path_m;
!     window_list_t                window_list_m;
!     action_fallback_proc_t       fallback_m;
!     adobe::widget_factory_proc_t widget_factory_m;
  };
  

Index: ui_core.hpp
===================================================================
RCS file: /cvsroot/adobe-source/sandbox/adobe-source/adobe/future/widgets/headers/ui_core.hpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** ui_core.hpp	3 Feb 2006 18:33:36 -0000	1.8
--- ui_core.hpp	23 Feb 2006 23:28:55 -0000	1.9
***************
*** 66,70 ****
  ADOBE_UI_CORE_IMPLEMENTATION_SWAP_DECLARATION(progress_bar_t)
  ADOBE_UI_CORE_IMPLEMENTATION_SWAP_DECLARATION(separator_t)
- ADOBE_UI_CORE_IMPLEMENTATION_SWAP_DECLARATION(static_text_t)
  ADOBE_UI_CORE_IMPLEMENTATION_SWAP_DECLARATION(edit_text_t)
  ADOBE_UI_CORE_IMPLEMENTATION_SWAP_DECLARATION(popup_t)
--- 66,69 ----
***************
*** 1009,1052 ****
  /****************************************************************************************************/
  
- struct static_text_t : boost::equality_comparable<static_text_t>
- {
-     struct implementation_t;
- 
-     static_text_t();
-     static_text_t(const static_text_t& rhs);
- 
-     ~static_text_t();
- 
-     void            initialize(const std::string& name);
- 
-     extents_t       best_bounds();
-     void            set_bounds(const point_2d_t& position, const extents_t& geometry);
- 
-     void            set_name(const std::string& name);
- 
-     void            set_theme(theme_t theme);
-     void            adorn_theme(theme_t theme);
-     void            unadorn_theme(theme_t theme);
- 
-     void            set_active(bool make_active);
-     void            set_visible(bool make_visible);
- 
-     long            best_height_given_width(long width);
- 
-     void            signal_hit(implementation::static_text_hit_proc_t proc);
- 
- private:
-      ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::static_text_t);
-      ADOBE_UI_CORE_IMPLEMENTATION_SWAP_FRIEND_DECLARATION(static_text_t);
- 
-     implementation_t*   object_m;
- 
- public:
-     implementation_t&       implementation();
-     const implementation_t& implementation() const;
- };
- 
- /****************************************************************************************************/
- 
  struct edit_text_t : boost::equality_comparable<edit_text_t>
  {
--- 1008,1011 ----
***************
*** 1259,1263 ****
  ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DECLARATION(adobe::progress_bar_t);
  ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DECLARATION(adobe::separator_t);
- ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DECLARATION(adobe::static_text_t);
  ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DECLARATION(adobe::edit_text_t);
  ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DECLARATION(adobe::popup_t);
--- 1218,1221 ----