Menu
▾
▴
adobe-source-commits — CVS repository commit notification
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
(67) |
Apr
(455) |
May
(202) |
Jun
(136) |
Jul
(203) |
Aug
(60) |
Sep
(88) |
Oct
(64) |
Nov
(56) |
Dec
(78) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(271) |
Feb
(207) |
Mar
|
Apr
|
May
(167) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Tobias S. <t_s...@us...> - 2005-04-20 08:06:55
|
Update of /cvsroot/adobe-source/sandbox/adobe-source/adobe/test/visual/headers/win In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24728/adobe-source/adobe/test/visual/headers/win Modified Files: ui_core_implementation.hpp Log Message: Silences GCC warnings (initialization order of member fields) Index: ui_core_implementation.hpp =================================================================== RCS file: /cvsroot/adobe-source/sandbox/adobe-source/adobe/test/visual/headers/win/ui_core_implementation.hpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** ui_core_implementation.hpp 18 Apr 2005 17:20:36 -0000 1.11 --- ui_core_implementation.hpp 20 Apr 2005 08:06:42 -0000 1.12 *************** *** 121,127 **** rectangle_t geometry_m; // saving set_bounds param for essentials point_t position_m; // saving set_bounds param for widget framing ! int uxtheme_type_m; static HWND invisible_parent_m; // an invisible window used as the initial parent for all controls. ! event_dispatcher::reference event_dispatcher_m; // ref. to singleton event dispatcher. HMENU child_id_m; // this control_m's child id. #ifndef NDEBUG --- 121,127 ---- rectangle_t geometry_m; // saving set_bounds param for essentials point_t position_m; // saving set_bounds param for widget framing ! int uxtheme_type_m; static HWND invisible_parent_m; // an invisible window used as the initial parent for all controls. ! event_dispatcher::reference event_dispatcher_m; // ref. to singleton event dispatcher. HMENU child_id_m; // this control_m's child id. #ifndef NDEBUG *************** *** 458,464 **** bool static_disabled_m; bool using_label_m; - bool scrollable_m; long rows_m; long cols_m; long edit_baseline_m; long edit_height_m; --- 458,464 ---- bool static_disabled_m; bool using_label_m; long rows_m; long cols_m; + bool scrollable_m; long edit_baseline_m; long edit_height_m; |
|
From: Tobias S. <t_s...@us...> - 2005-04-20 08:05:18
|
Update of /cvsroot/adobe-source/sandbox/adobe-source/adobe/test/visual/headers In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24248/adobe-source/adobe/test/visual/headers Modified Files: ui_core.hpp Log Message: Fixes an error when building with GCC (MinGW or Cygwin) Index: ui_core.hpp =================================================================== RCS file: /cvsroot/adobe-source/sandbox/adobe-source/adobe/test/visual/headers/ui_core.hpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** ui_core.hpp 15 Apr 2005 22:28:00 -0000 1.8 --- ui_core.hpp 20 Apr 2005 08:05:09 -0000 1.9 *************** *** 12,20 **** /****************************************************************************************************/ - #if ADOBE_PLATFORM_WIN - # include <string> - # include <sstream> - #endif - #include <boost/function.hpp> #include <boost/operators.hpp> --- 12,15 ---- *************** *** 25,28 **** --- 20,31 ---- #include <adobe/rectangle.hpp> + /* + REVISIT (t_schwinger) : Actually this should be ADOBE_PLATFORM_WIN, but + reportedly MSVC doesn't like it. + */ + #ifdef __MINGW32__ + # include <sstream> + #endif + /****************************************************************************************************/ |
|
From: Tobias S. <t_s...@us...> - 2005-04-20 08:03:24
|
Update of /cvsroot/adobe-source/sandbox/adobe-source/adobe/test/visual/sources/win In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22693/adobe-source/adobe/test/visual/sources/win Modified Files: ui_core_implementation.cpp Log Message: Fixes an error when building in release mode and silences GCC warnings (initialization order of member fields, unused variables) Index: ui_core_implementation.cpp =================================================================== RCS file: /cvsroot/adobe-source/sandbox/adobe-source/adobe/test/visual/sources/win/ui_core_implementation.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** ui_core_implementation.cpp 18 Apr 2005 17:20:37 -0000 1.17 --- ui_core_implementation.cpp 20 Apr 2005 08:03:02 -0000 1.18 *************** *** 432,437 **** { static const long link_line_width(2); ! HWND parent(::GetAncestor(link.control_m, GA_ROOT)); ! long num_prongs(link.prongs_m.size()); RECT bounds = { 0 }; point_set_t points; --- 432,438 ---- { static const long link_line_width(2); ! // curently unused: ! // HWND parent(::GetAncestor(link.control_m, GA_ROOT)); ! std::size_t num_prongs(link.prongs_m.size()); RECT bounds = { 0 }; point_set_t points; *************** *** 479,485 **** bounds.right += 2; // reset inset for the link icon ! short center = bounds.top + ! link.prongs_m[0] - link_line_width + ! (link.prongs_m[num_prongs - 1] - link.prongs_m[0]) / 2; // draw link icon here at { bounds.right - 5, center - 8, 9, 16 } --- 480,487 ---- bounds.right += 2; // reset inset for the link icon ! // currently unused: ! // short center = bounds.top + ! // link.prongs_m[0] - link_line_width + ! // (link.prongs_m[num_prongs - 1] - link.prongs_m[0]) / 2; // draw link icon here at { bounds.right - 5, center - 8, 9, 16 } *************** *** 1543,1547 **** control_t::control_t() : ! control_m(0), uxtheme_type_m(0), theme_m(theme_default_s), default_window_proc_m(0), child_id_m(0) #ifndef NDEBUG --- 1545,1549 ---- control_t::control_t() : ! control_m(0), default_window_proc_m(0), theme_m(theme_default_s), uxtheme_type_m(0), child_id_m(0) #ifndef NDEBUG *************** *** 1592,1596 **** control_t::control_t(const control_t& rhs) : ! control_m(0), uxtheme_type_m(0), theme_m(rhs.theme_m), default_window_proc_m(0), child_id_m(0) #ifndef NDEBUG --- 1594,1598 ---- control_t::control_t(const control_t& rhs) : ! control_m(0), default_window_proc_m(0), theme_m(rhs.theme_m), uxtheme_type_m(0), child_id_m(0) #ifndef NDEBUG *************** *** 1860,1864 **** void control_t::user_hit() { ! ::MessageBeep(-1); } --- 1862,1866 ---- void control_t::user_hit() { ! ::MessageBeep(static_cast<UINT>(-1)); } *************** *** 2025,2029 **** _super::set_theme(theme); ! theme_t masked(theme & theme_mask_s); } --- 2027,2032 ---- _super::set_theme(theme); ! // currently unused ! // theme_t masked(theme & theme_mask_s); } *************** *** 2241,2245 **** assert(control_m); ! BS_DEFPUSHBUTTON; // set_widget_data(control_m, kControlEntireControl, // kControlPushButtonDefaultTag, Boolean(is_default)); --- 2244,2248 ---- assert(control_m); ! // BS_DEFPUSHBUTTON; // set_widget_data(control_m, kControlEntireControl, // kControlPushButtonDefaultTag, Boolean(is_default)); *************** *** 2574,2578 **** --- 2577,2583 ---- draw_link(*link, context); + #ifndef NDEBUG frame_widget(*control); // Done after the default wind proc has drawn the widget + #endif } *************** *** 3028,3032 **** cols_m(rhs.cols_m), scrollable_m(rhs.scrollable_m), edit_baseline_m(rhs.edit_baseline_m), edit_height_m(rhs.edit_height_m), ! static_height_m(rhs.static_height_m), static_baseline_m(rhs.static_baseline_m) { RECT bounds = { 0 }; --- 3033,3037 ---- cols_m(rhs.cols_m), scrollable_m(rhs.scrollable_m), edit_baseline_m(rhs.edit_baseline_m), edit_height_m(rhs.edit_height_m), ! static_baseline_m(rhs.static_baseline_m), static_height_m(rhs.static_height_m) { RECT bounds = { 0 }; *************** *** 3370,3375 **** popup_t::implementation_t::implementation_t() : ! static_disabled_m(false), using_label_m(false), static_baseline_m(0), static_height_m(0), ! popup_baseline_m(0), popup_height_m(0) { } --- 3375,3380 ---- popup_t::implementation_t::implementation_t() : ! static_disabled_m(false), static_baseline_m(0), static_height_m(0), ! popup_baseline_m(0), popup_height_m(0), using_label_m(false) { } *************** *** 3378,3385 **** popup_t::implementation_t::implementation_t(const implementation_t& rhs) : ! _super(rhs), static_disabled_m(rhs.static_disabled_m), ! using_label_m(rhs.using_label_m), name_m(rhs.name_m), static_baseline_m(rhs.static_baseline_m), static_height_m(rhs.static_height_m), ! popup_baseline_m(rhs.popup_baseline_m), popup_height_m(rhs.popup_height_m) { RECT bounds = { 0 }; --- 3383,3390 ---- popup_t::implementation_t::implementation_t(const implementation_t& rhs) : ! _super(rhs), name_m(rhs.name_m), static_disabled_m(rhs.static_disabled_m), static_baseline_m(rhs.static_baseline_m), static_height_m(rhs.static_height_m), ! popup_baseline_m(rhs.popup_baseline_m), popup_height_m(rhs.popup_height_m), ! using_label_m(rhs.using_label_m) { RECT bounds = { 0 }; *************** *** 3487,3491 **** { RECT text = { 0, 0, 0, 0 }; ! RECT size = { 0, 0, 0, 0 }; WINDOWINFO wi = { 0 }; wi.cbSize = sizeof(wi); --- 3492,3497 ---- { RECT text = { 0, 0, 0, 0 }; ! // currently unused ! // RECT size = { 0, 0, 0, 0 }; WINDOWINFO wi = { 0 }; wi.cbSize = sizeof(wi); *************** *** 4073,4076 **** --- 4079,4083 ---- case slider_points_down_s: win32_style |= TBS_BOTTOM; break; case slider_points_right_s: win32_style |= TBS_RIGHT; break; + default: break; // silences a GCC warning } } *************** *** 4386,4393 **** assert(window); RECT one_bounds = { 0, 0, 1, 1 }; RECT global_bounds; - #if 0 static ControlUserPaneDrawUPP draw_handler(::NewControlUserPaneDrawUPP(draw_hitless)); --- 4393,4400 ---- assert(window); + #if 0 RECT one_bounds = { 0, 0, 1, 1 }; RECT global_bounds; static ControlUserPaneDrawUPP draw_handler(::NewControlUserPaneDrawUPP(draw_hitless)); *************** *** 4437,4443 **** void hitless_t::implementation_t::overlay_bounds_update() { RECT overlay_bounds = { 0 }; RECT hosting_bounds = { 0 }; ! #if 0 WindowClass host_window_class(0); --- 4444,4451 ---- void hitless_t::implementation_t::overlay_bounds_update() { + #if 0 RECT overlay_bounds = { 0 }; RECT hosting_bounds = { 0 }; ! WindowClass host_window_class(0); |
|
From: Tobias S. <t_s...@us...> - 2005-04-20 07:57:34
|
Update of /cvsroot/adobe-source/sandbox/adobe-source/adobe/test/visual/sources In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19710/adobe-source/adobe/test/visual/sources Modified Files: client_assembler.cpp Log Message: Silences some GCC warnings (initialization order of member fields, signed/unsigned comparison) Index: client_assembler.cpp =================================================================== RCS file: /cvsroot/adobe-source/sandbox/adobe-source/adobe/test/visual/sources/client_assembler.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** client_assembler.cpp 15 Apr 2005 23:22:43 -0000 1.10 --- client_assembler.cpp 20 Apr 2005 07:57:22 -0000 1.11 *************** *** 253,262 **** mac_token_t(adobe::sheet_t& sheet, adobe::eve_t& layout, adobe::assemblage_t& slave, eve_client::eve_client_holder& holder, const eve_client::button_notifier_t& notifier, size_enum_t dialog_size) : assemblage_m(slave), sheet_m(sheet), layout_m(layout), holder_m(holder), notifier_m(notifier), ! dialog_size_m(dialog_size), ! root_m(0) { } --- 253,262 ---- mac_token_t(adobe::sheet_t& sheet, adobe::eve_t& layout, adobe::assemblage_t& slave, eve_client::eve_client_holder& holder, const eve_client::button_notifier_t& notifier, size_enum_t dialog_size) : assemblage_m(slave), + root_m(0), sheet_m(sheet), layout_m(layout), holder_m(holder), notifier_m(notifier), ! dialog_size_m(dialog_size) { } *************** *** 264,269 **** adobe::window_t* root_m; adobe::sheet_t& sheet_m; - eve_client::eve_client_holder& holder_m; adobe::eve_t& layout_m; eve_client::button_notifier_t notifier_m; size_enum_t dialog_size_m; --- 264,269 ---- adobe::window_t* root_m; adobe::sheet_t& sheet_m; adobe::eve_t& layout_m; + eve_client::eve_client_holder& holder_m; eve_client::button_notifier_t notifier_m; size_enum_t dialog_size_m; *************** *** 325,329 **** bool metal_m; bool inited_m; ! adobe::name_t target_m; }; --- 325,329 ---- bool metal_m; bool inited_m; ! adobe::name_t target_m; }; *************** *** 509,518 **** std::string name_m; - adobe::name_t modifiers_m; - adobe::name_t action_m; adobe::name_t bind_m; adobe::name_t bind_output_m; adobe::value_t value_m; adobe::dictionary_t contributing_m; }; --- 509,518 ---- std::string name_m; adobe::name_t bind_m; adobe::name_t bind_output_m; + adobe::name_t action_m; adobe::value_t value_m; adobe::dictionary_t contributing_m; + adobe::name_t modifiers_m; }; *************** *** 750,755 **** void control_value(std::size_t new_value); - std::size_t last_m; // Used to debounce double value_m; adobe::slider_t control_m; format_t format_m; --- 750,755 ---- void control_value(std::size_t new_value); double value_m; + std::size_t last_m; // Used to debounce adobe::slider_t control_m; format_t format_m; *************** *** 1558,1564 **** client_proxy_t(parameters), characters_m(edit_text_characters), value_ref_m(0), ! edit_active_ref_m(0), ! num_lines_m(1) { bool monospaced(false); --- 1558,1564 ---- client_proxy_t(parameters), characters_m(edit_text_characters), + num_lines_m(1), value_ref_m(0), ! edit_active_ref_m(0) { bool monospaced(false); *************** *** 1796,1804 **** popup_adjust_m(0), #endif value_ref_m(0), edit_active_ref_m(0), ! static_active_ref_m(0), ! go_static_m(false), ! monospaced_m(false) { std::string format("#.00"); --- 1796,1804 ---- popup_adjust_m(0), #endif + monospaced_m(false), + go_static_m(false), value_ref_m(0), edit_active_ref_m(0), ! static_active_ref_m(0) { std::string format("#.00"); *************** *** 1924,1928 **** std::size_t edit_number_proxy_t::popup_index() { ! for (long value(0); value < units_m.size(); ++value) if (units_m[value] == unit_value_m) return value; --- 1924,1928 ---- std::size_t edit_number_proxy_t::popup_index() { ! for (std::size_t value(0); value < units_m.size(); ++value) if (units_m[value] == unit_value_m) return value; *************** *** 2319,2323 **** if (show_value_m.type() == typeid(adobe::empty_t)) { ! if (tab_parent && tab_parent->panel_index_m < tab_parent->items_m.size()) show_value_m = tab_parent->items_m[tab_parent->panel_index_m++].get<adobe::dictionary_t>()[key_value]; } --- 2319,2323 ---- if (show_value_m.type() == typeid(adobe::empty_t)) { ! if (tab_parent && std::size_t(tab_parent->panel_index_m) < tab_parent->items_m.size()) show_value_m = tab_parent->items_m[tab_parent->panel_index_m++].get<adobe::dictionary_t>()[key_value]; } *************** *** 2829,2836 **** client_proxy_t*) : client_proxy_t(parameters), grow_m(false), metal_m(false), ! inited_m(false), ! layout_m(NULL) { parameters.get<adobe::name_t>(key_target, target_m); --- 2829,2836 ---- client_proxy_t*) : client_proxy_t(parameters), + layout_m(NULL), grow_m(false), metal_m(false), ! inited_m(false) { parameters.get<adobe::name_t>(key_target, target_m); *************** *** 3176,3181 **** window_server_t::window_server_t(const char* directory_path, adobe::sheet_t& sheet) : ! directory_path_m(directory_path), ! sheet_m(sheet) { } --- 3176,3181 ---- window_server_t::window_server_t(const char* directory_path, adobe::sheet_t& sheet) : ! sheet_m(sheet), ! directory_path_m(directory_path) { } |
|
From: Foster B. <fos...@us...> - 2005-04-20 00:26:49
|
Update of /cvsroot/adobe-source/sandbox/visual_refactor/adobe/test/visual/headers/win In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12747/adobe/test/visual/headers/win Modified Files: ui_core_implementation.hpp Log Message: Building again on Win32 Index: ui_core_implementation.hpp =================================================================== RCS file: /cvsroot/adobe-source/sandbox/visual_refactor/adobe/test/visual/headers/win/ui_core_implementation.hpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ui_core_implementation.hpp 19 Apr 2005 17:55:56 -0000 1.2 --- ui_core_implementation.hpp 20 Apr 2005 00:25:40 -0000 1.3 *************** *** 44,48 **** #ifndef NDEBUG ! struct hitless_t : boost::totally_ordered<hitless_t> { struct implementation_t; --- 44,48 ---- #ifndef NDEBUG ! struct hitless_t : boost::equality_comparable<hitless_t> { struct implementation_t; *************** *** 55,65 **** void initialize(window_t& window); ! void set_bounds(const point_t& position, const extents_t& geometry); private: ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_FRIEND_DECLARATION(adobe::hitless_t); ! friend void frame_geometry(window_t& window, const point_t& position, const extents_t& geometry); ! friend bool clear_geometry_frames(window_t& window); implementation_t* object_m; --- 55,65 ---- void initialize(window_t& window); ! void set_bounds(const point_2d_t& position, const extents_t& geometry); private: ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::hitless_t); ! friend void frame_extents(window_t& window, const point_2d_t& position, const extents_t& geometry); ! friend bool clear_extents_frames(window_t& window); implementation_t* object_m; *************** *** 73,79 **** /****************************************************************************************************/ ! struct control_t : boost::totally_ordered<control_t> { control_t(); control_t(const control_t& rhs); --- 73,80 ---- /****************************************************************************************************/ ! struct control_t : boost::equality_comparable<control_t> { control_t(); + control_t(theme_t theme); control_t(const control_t& rhs); *************** *** 82,86 **** virtual extents_t best_bounds(); ! void set_bounds(const point_t& position, const extents_t& geometry); void set_name(const std::string& name); virtual void set_theme(theme_t theme); --- 83,87 ---- virtual extents_t best_bounds(); ! void set_bounds(const point_2d_t& position, const extents_t& geometry); void set_name(const std::string& name); virtual void set_theme(theme_t theme); *************** *** 109,113 **** virtual void modify(modifiers_t modifiers); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_FRIEND_DECLARATION(adobe::control_t); virtual dictionary_t essentials() const; --- 110,114 ---- virtual void modify(modifiers_t modifiers); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::control_t); virtual dictionary_t essentials() const; *************** *** 120,124 **** implementation::control_focus_proc_t focus_proc_m; extents_t geometry_m; // saving set_bounds param for essentials ! point_t position_m; // saving set_bounds param for widget framing int uxtheme_type_m; static HWND invisible_parent_m; // an invisible window used as the initial parent for all controls. --- 121,125 ---- implementation::control_focus_proc_t focus_proc_m; extents_t geometry_m; // saving set_bounds param for essentials ! point_2d_t position_m; // saving set_bounds param for widget framing int uxtheme_type_m; static HWND invisible_parent_m; // an invisible window used as the initial parent for all controls. *************** *** 132,136 **** /****************************************************************************************************/ ! struct window_t::implementation_t : boost::totally_ordered<window_t::implementation_t> { implementation_t(); --- 133,137 ---- /****************************************************************************************************/ ! struct window_t::implementation_t : boost::equality_comparable<window_t::implementation_t> { implementation_t(); *************** *** 149,153 **** DWORD style); ! void set_bounds(const point_t& position, const extents_t& geometry); void reposition(window_reposition_t position); void set_visible(bool make_visible); --- 150,154 ---- DWORD style); ! void set_bounds(const point_2d_t& position, const extents_t& geometry); void reposition(window_reposition_t position); void set_visible(bool make_visible); *************** *** 155,159 **** void signal_resize_complete(const implementation::window_resize_complete_proc_t& proc); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_FRIEND_DECLARATION(adobe::window_t::implementation_t); dictionary_t essentials() const; --- 156,160 ---- void signal_resize_complete(const implementation::window_resize_complete_proc_t& proc); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::window_t::implementation_t); dictionary_t essentials() const; *************** *** 196,200 **** virtual extents_t best_bounds(); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_FRIEND_DECLARATION(adobe::group_t::implementation_t); virtual dictionary_t essentials() const; --- 197,201 ---- virtual extents_t best_bounds(); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::group_t::implementation_t); virtual dictionary_t essentials() const; *************** *** 220,224 **** virtual LRESULT event(UINT msg, WPARAM wParam, LPARAM lParam); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_FRIEND_DECLARATION(adobe::tab_group_t::implementation_t); virtual dictionary_t essentials() const; --- 221,225 ---- virtual LRESULT event(UINT msg, WPARAM wParam, LPARAM lParam); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::tab_group_t::implementation_t); virtual dictionary_t essentials() const; *************** *** 237,241 **** implementation_t(const implementation_t& rhs); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_FRIEND_DECLARATION(adobe::panel_t::implementation_t); virtual dictionary_t essentials() const; --- 238,242 ---- implementation_t(const implementation_t& rhs); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::panel_t::implementation_t); virtual dictionary_t essentials() const; *************** *** 265,269 **** virtual void modify(modifiers_t modifiers); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_FRIEND_DECLARATION(adobe::button_t::implementation_t); virtual dictionary_t essentials() const; --- 266,270 ---- virtual void modify(modifiers_t modifiers); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::button_t::implementation_t); virtual dictionary_t essentials() const; *************** *** 289,293 **** void signal_hit(const implementation::radio_button_hit_proc_t& proc); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_FRIEND_DECLARATION(adobe::radio_button_t::implementation_t); virtual dictionary_t essentials() const; --- 290,294 ---- void signal_hit(const implementation::radio_button_hit_proc_t& proc); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::radio_button_t::implementation_t); virtual dictionary_t essentials() const; *************** *** 305,316 **** typedef control_t _super; ! implementation_t(); implementation_t(const implementation_t& rhs); void initialize(const RECT& bounds, const std::string& name); ! virtual void set_value(std::size_t is_checked); void signal_hit(const implementation::checkbox_hit_proc_t& proc); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_FRIEND_DECLARATION(adobe::checkbox_t::implementation_t); virtual dictionary_t essentials() const; --- 306,325 ---- typedef control_t _super; ! implementation_t( const std::string& name, ! adobe::value_t true_value, ! adobe::value_t false_value, ! theme_t theme); ! implementation_t(const implementation_t& rhs); void initialize(const RECT& bounds, const std::string& name); ! ! virtual extents_t measure(); ! ! virtual void set_value(adobe::value_t new_value); ! void signal_hit(const implementation::checkbox_hit_proc_t& proc); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::checkbox_t::implementation_t); virtual dictionary_t essentials() const; *************** *** 319,323 **** implementation::checkbox_hit_proc_t hit_proc_m; ! bool is_checked_m; }; --- 328,334 ---- implementation::checkbox_hit_proc_t hit_proc_m; ! adobe::value_t true_value_m; ! adobe::value_t false_value_m; ! adobe::value_t current_value_m; }; *************** *** 332,336 **** void initialize(const RECT& bounds); ! void set_bounds(const point_t& position, const extents_t& geometry); void set_value(bool value); void set_visible(bool make_visible); --- 343,347 ---- void initialize(const RECT& bounds); ! void set_bounds(const point_2d_t& position, const extents_t& geometry); void set_value(bool value); void set_visible(bool make_visible); *************** *** 338,347 **** void signal_hit(const implementation::link_hit_proc_t& proc); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_FRIEND_DECLARATION(adobe::link_t::implementation_t); virtual dictionary_t essentials() const; implementation::link_hit_proc_t hit_proc_m; ! points_of_interest_t prongs_m; bool value_m; bool visible_m; --- 349,358 ---- void signal_hit(const implementation::link_hit_proc_t& proc); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::link_t::implementation_t); virtual dictionary_t essentials() const; implementation::link_hit_proc_t hit_proc_m; ! guide_set_t prongs_m; bool value_m; bool visible_m; *************** *** 366,370 **** void set_value(long value); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_FRIEND_DECLARATION(adobe::progress_bar_t::implementation_t); virtual dictionary_t essentials() const; --- 377,381 ---- void set_value(long value); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::progress_bar_t::implementation_t); virtual dictionary_t essentials() const; *************** *** 383,387 **** implementation_t(const implementation_t& rhs); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_FRIEND_DECLARATION(adobe::separator_t::implementation_t); virtual dictionary_t essentials() const; --- 394,398 ---- implementation_t(const implementation_t& rhs); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::separator_t::implementation_t); virtual dictionary_t essentials() const; *************** *** 404,408 **** void signal_hit(const implementation::static_text_hit_proc_t& proc); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_FRIEND_DECLARATION(adobe::static_text_t::implementation_t); virtual dictionary_t essentials() const; --- 415,419 ---- void signal_hit(const implementation::static_text_hit_proc_t& proc); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::static_text_t::implementation_t); virtual dictionary_t essentials() const; *************** *** 429,433 **** static_text_t& get_label(); virtual extents_t best_bounds(); ! void set_bounds(const point_t& position, const extents_t& geometry); void set_active(bool active); virtual void set_theme(theme_t theme); --- 440,444 ---- static_text_t& get_label(); virtual extents_t best_bounds(); ! void set_bounds(const point_2d_t& position, const extents_t& geometry); void set_active(bool active); virtual void set_theme(theme_t theme); *************** *** 448,452 **** virtual LRESULT event(UINT msg, WPARAM wParam, LPARAM lParam); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_FRIEND_DECLARATION(adobe::edit_text_t::implementation_t); virtual dictionary_t essentials() const; --- 459,463 ---- virtual LRESULT event(UINT msg, WPARAM wParam, LPARAM lParam); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::edit_text_t::implementation_t); virtual dictionary_t essentials() const; *************** *** 484,488 **** static_text_t& get_label(); virtual extents_t best_bounds(); ! void set_bounds(const point_t& position, const extents_t& geometry); void set_active(bool active); virtual void set_theme(theme_t theme); --- 495,499 ---- static_text_t& get_label(); virtual extents_t best_bounds(); ! void set_bounds(const point_2d_t& position, const extents_t& geometry); void set_active(bool active); virtual void set_theme(theme_t theme); *************** *** 496,500 **** virtual LRESULT event(UINT message, WPARAM wParam, LPARAM lParam); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_FRIEND_DECLARATION(adobe::popup_t::implementation_t); virtual dictionary_t essentials() const; --- 507,511 ---- virtual LRESULT event(UINT message, WPARAM wParam, LPARAM lParam); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::popup_t::implementation_t); virtual dictionary_t essentials() const; *************** *** 528,532 **** popup_t& get_popup(); virtual extents_t best_bounds(); ! void set_bounds(const point_t& position, const extents_t& geometry); void set_active(bool active); virtual void set_theme(theme_t theme); --- 539,543 ---- popup_t& get_popup(); virtual extents_t best_bounds(); ! void set_bounds(const point_2d_t& position, const extents_t& geometry); void set_active(bool active); virtual void set_theme(theme_t theme); *************** *** 537,541 **** void signal_popup_value_change(implementation::popup_value_proc_t proc); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_FRIEND_DECLARATION(adobe::unit_edit_text_t::implementation_t); virtual dictionary_t essentials() const; --- 548,552 ---- void signal_popup_value_change(implementation::popup_value_proc_t proc); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::unit_edit_text_t::implementation_t); virtual dictionary_t essentials() const; *************** *** 568,572 **** void signal_value_change(const implementation::slider_value_proc_t& proc); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_FRIEND_DECLARATION(adobe::slider_t::implementation_t); virtual dictionary_t essentials() const; --- 579,583 ---- void signal_value_change(const implementation::slider_value_proc_t& proc); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::slider_t::implementation_t); virtual dictionary_t essentials() const; *************** *** 601,605 **** void signal_value_change(const implementation::bevel_button_popup_value_proc_t& proc); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_FRIEND_DECLARATION(adobe::bevel_button_t::implementation_t); virtual dictionary_t essentials() const; --- 612,616 ---- void signal_value_change(const implementation::bevel_button_popup_value_proc_t& proc); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::bevel_button_t::implementation_t); virtual dictionary_t essentials() const; *************** *** 653,660 **** void initialize(const RECT& bounds, HWND window); ! void set_bounds(const point_t& position, const extents_t& geometry); void overlay_bounds_update(); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_FRIEND_DECLARATION(adobe::hitless_t::implementation_t); virtual dictionary_t essentials() const; --- 664,671 ---- void initialize(const RECT& bounds, HWND window); ! void set_bounds(const point_2d_t& position, const extents_t& geometry); void overlay_bounds_update(); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::hitless_t::implementation_t); virtual dictionary_t essentials() const; *************** *** 668,690 **** /****************************************************************************************************/ ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DECLARATION(adobe::window_t::implementation_t); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DECLARATION(adobe::control_t); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DECLARATION(adobe::group_t::implementation_t); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DECLARATION(adobe::tab_group_t::implementation_t); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DECLARATION(adobe::button_t::implementation_t); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DECLARATION(adobe::panel_t::implementation_t); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DECLARATION(adobe::radio_button_t::implementation_t); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DECLARATION(adobe::checkbox_t::implementation_t); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DECLARATION(adobe::link_t::implementation_t); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DECLARATION(adobe::progress_bar_t::implementation_t); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DECLARATION(adobe::separator_t::implementation_t); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DECLARATION(adobe::static_text_t::implementation_t); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DECLARATION(adobe::edit_text_t::implementation_t); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DECLARATION(adobe::popup_t::implementation_t); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DECLARATION(adobe::unit_edit_text_t::implementation_t); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DECLARATION(adobe::slider_t::implementation_t); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DECLARATION(adobe::bevel_button_t::implementation_t); #ifndef NDEBUG ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DECLARATION(adobe::hitless_t::implementation_t); #endif // NDEBUG --- 679,701 ---- /****************************************************************************************************/ ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DECLARATION(adobe::window_t::implementation_t); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DECLARATION(adobe::control_t); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DECLARATION(adobe::group_t::implementation_t); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DECLARATION(adobe::tab_group_t::implementation_t); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DECLARATION(adobe::button_t::implementation_t); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DECLARATION(adobe::panel_t::implementation_t); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DECLARATION(adobe::radio_button_t::implementation_t); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DECLARATION(adobe::checkbox_t::implementation_t); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DECLARATION(adobe::link_t::implementation_t); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DECLARATION(adobe::progress_bar_t::implementation_t); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DECLARATION(adobe::separator_t::implementation_t); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DECLARATION(adobe::static_text_t::implementation_t); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DECLARATION(adobe::edit_text_t::implementation_t); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DECLARATION(adobe::popup_t::implementation_t); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DECLARATION(adobe::unit_edit_text_t::implementation_t); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DECLARATION(adobe::slider_t::implementation_t); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DECLARATION(adobe::bevel_button_t::implementation_t); #ifndef NDEBUG ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DECLARATION(adobe::hitless_t::implementation_t); #endif // NDEBUG |
|
From: Foster B. <fos...@us...> - 2005-04-20 00:26:41
|
Update of /cvsroot/adobe-source/sandbox/visual_refactor/adobe/build/asl_lib_dev In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12747/adobe/build/asl_lib_dev Modified Files: asl_lib_dev.vcproj Log Message: Building again on Win32 Index: asl_lib_dev.vcproj =================================================================== RCS file: /cvsroot/adobe-source/sandbox/visual_refactor/adobe/build/asl_lib_dev/asl_lib_dev.vcproj,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** asl_lib_dev.vcproj 18 Apr 2005 21:15:37 -0000 1.1 --- asl_lib_dev.vcproj 20 Apr 2005 00:25:40 -0000 1.2 *************** *** 147,150 **** --- 147,153 ---- </File> <File + RelativePath="..\..\source\extents.cpp"> + </File> + <File RelativePath="..\..\source\istream.cpp"> </File> *************** *** 159,165 **** </File> <File - RelativePath="..\..\source\rectangle.cpp"> - </File> - <File RelativePath="..\..\source\string_pool.cpp"> </File> --- 162,165 ---- |
|
From: Foster B. <fos...@us...> - 2005-04-20 00:26:39
|
Update of /cvsroot/adobe-source/sandbox/visual_refactor/adobe/build/asl_lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12747/adobe/build/asl_lib Modified Files: asl_lib.vcproj Log Message: Building again on Win32 Index: asl_lib.vcproj =================================================================== RCS file: /cvsroot/adobe-source/sandbox/visual_refactor/adobe/build/asl_lib/asl_lib.vcproj,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** asl_lib.vcproj 18 Apr 2005 21:15:35 -0000 1.1 --- asl_lib.vcproj 20 Apr 2005 00:25:39 -0000 1.2 *************** *** 144,147 **** --- 144,150 ---- </File> <File + RelativePath="..\..\source\extents.cpp"> + </File> + <File RelativePath="..\..\source\istream.cpp"> </File> *************** *** 156,162 **** </File> <File - RelativePath="..\..\source\rectangle.cpp"> - </File> - <File RelativePath="..\..\source\string_pool.cpp"> </File> --- 159,162 ---- |
|
From: Foster B. <fos...@us...> - 2005-04-20 00:26:37
|
Update of /cvsroot/adobe-source/sandbox/visual_refactor/adobe/test/visual/sources/win In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12747/adobe/test/visual/sources/win Modified Files: ui_core_implementation.cpp Log Message: Building again on Win32 Index: ui_core_implementation.cpp =================================================================== RCS file: /cvsroot/adobe-source/sandbox/visual_refactor/adobe/test/visual/sources/win/ui_core_implementation.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ui_core_implementation.cpp 19 Apr 2005 17:56:00 -0000 1.2 --- ui_core_implementation.cpp 20 Apr 2005 00:25:40 -0000 1.3 *************** *** 151,156 **** if (s.poi_m.size()) { ! adobe::points_of_interest_t::const_iterator first(s.poi_m.begin()); ! adobe::points_of_interest_t::const_iterator last(s.poi_m.end()); adobe::array_t poi_array; --- 151,156 ---- if (s.poi_m.size()) { ! adobe::guide_set_t::const_iterator first(s.poi_m.begin()); ! adobe::guide_set_t::const_iterator last(s.poi_m.end()); adobe::array_t poi_array; *************** *** 640,648 **** { ! adobe::points_of_interest_t::const_iterator iter(control.geometry_m.slice_m[adobe::extents_slices_t::horizontal].poi_m.begin()); ! adobe::points_of_interest_t::const_iterator last(control.geometry_m.slice_m[adobe::extents_slices_t::horizontal].poi_m.end()); for (; iter != last; ++iter) { ! adobe::points_of_interest_t::value_type cur(*iter); long poi(left + cur); RECT top_tick = { poi, top, poi + 1, top + tick_height }; --- 640,648 ---- { ! adobe::guide_set_t::const_iterator iter(control.geometry_m.slice_m[adobe::extents_slices_t::horizontal].poi_m.begin()); ! adobe::guide_set_t::const_iterator last(control.geometry_m.slice_m[adobe::extents_slices_t::horizontal].poi_m.end()); for (; iter != last; ++iter) { ! adobe::guide_set_t::value_type cur(*iter); long poi(left + cur); RECT top_tick = { poi, top, poi + 1, top + tick_height }; *************** *** 655,663 **** { ! adobe::points_of_interest_t::const_iterator iter(control.geometry_m.slice_m[adobe::extents_slices_t::vertical].poi_m.begin()); ! adobe::points_of_interest_t::const_iterator last(control.geometry_m.slice_m[adobe::extents_slices_t::vertical].poi_m.end()); for (; iter != last; ++iter) { ! adobe::points_of_interest_t::value_type cur(*iter); long poi(top + cur); RECT left_tick = { left, poi, left + tick_width, poi + 1 }; --- 655,663 ---- { ! adobe::guide_set_t::const_iterator iter(control.geometry_m.slice_m[adobe::extents_slices_t::vertical].poi_m.begin()); ! adobe::guide_set_t::const_iterator last(control.geometry_m.slice_m[adobe::extents_slices_t::vertical].poi_m.end()); for (; iter != last; ++iter) { ! adobe::guide_set_t::value_type cur(*iter); long poi(top + cur); RECT left_tick = { left, poi, left + tick_width, poi + 1 }; *************** *** 1366,1370 **** /****************************************************************************************************/ ! void window_t::implementation_t::set_bounds(const point_t& position, const extents_t& geometry) { assert(window_m); --- 1366,1370 ---- /****************************************************************************************************/ ! void window_t::implementation_t::set_bounds(const point_2d_t& position, const extents_t& geometry) { assert(window_m); *************** *** 1377,1382 **** ::GetWindowRect(window_m, &window_rect); ! ::MoveWindow( window_m, position.first + window_rect.left, ! position.second + window_rect.top, geometry_m.width() + extra.first, geometry_m.height() + extra.second, TRUE); --- 1377,1382 ---- ::GetWindowRect(window_m, &window_rect); ! ::MoveWindow( window_m, position.x_m + window_rect.left, ! position.y_m + window_rect.top, geometry_m.width() + extra.first, geometry_m.height() + extra.second, TRUE); *************** *** 1540,1543 **** --- 1540,1585 ---- return DefWindowProc(window, message, wParam, lParam); } + + /****************************************************************************************************/ + + void register_invisible_parent(HWND& invisible_parent) + { + // + // If the invisible parent hasn't been created yet then we should create + // it here. + // + if (invisible_parent) return; + + WNDCLASSW wc; + // + // First we need to register the window class. As the static + // invisible parent hasn't been created yet, it's a pretty + // safe bet to assume that this class hasn't been registered + // yet. + // + wc.style = CS_HREDRAW | CS_VREDRAW; + wc.lpfnWndProc = invisible_window_proc; + wc.cbClsExtra = 0; + wc.cbWndExtra = 0; + wc.hInstance = ::GetModuleHandle(NULL); + wc.hIcon = 0; + wc.hCursor = LoadCursor(NULL, IDC_ARROW); + wc.hbrBackground = (HBRUSH)(COLOR_BTNFACE + 1); + wc.hbrBackground = (HBRUSH)(COLOR_BACKGROUND + 1); + wc.lpszMenuName = NULL; + wc.lpszClassName = L"eve_invisible_parent"; + + if (!RegisterClassW(&wc)) ADOBE_THROW_LAST_ERROR; + + // + // Now create the window. + // + invisible_parent = CreateWindowExW(WS_EX_COMPOSITED, L"eve_invisible_parent", + L"invisible", WS_POPUP, 0, 0, CW_USEDEFAULT, CW_USEDEFAULT, NULL, NULL, + ::GetModuleHandle(NULL), NULL); + + if (!invisible_parent) ADOBE_THROW_LAST_ERROR; + } + /****************************************************************************************************/ *************** *** 1553,1590 **** // child_id_m = event_dispatcher_m.subscribe(this); // ! // If the invisible parent hasn't been created yet then we should create ! // it here. // ! if (!invisible_parent_m) ! { ! WNDCLASSW wc; ! // ! // First we need to register the window class. As the static ! // invisible parent hasn't been created yet, it's a pretty ! // safe bet to assume that this class hasn't been registered ! // yet. ! // ! wc.style = CS_HREDRAW | CS_VREDRAW; ! wc.lpfnWndProc = invisible_window_proc; ! wc.cbClsExtra = 0; ! wc.cbWndExtra = 0; ! wc.hInstance = ::GetModuleHandle(NULL); ! wc.hIcon = 0; ! wc.hCursor = LoadCursor(NULL, IDC_ARROW); ! wc.hbrBackground = (HBRUSH)(COLOR_BTNFACE + 1); ! wc.hbrBackground = (HBRUSH)(COLOR_BACKGROUND + 1); ! wc.lpszMenuName = NULL; ! wc.lpszClassName = L"eve_invisible_parent"; ! if (!RegisterClassW(&wc)) ADOBE_THROW_LAST_ERROR; ! // ! // Now create the window. ! // ! invisible_parent_m = CreateWindowExW(WS_EX_COMPOSITED, L"eve_invisible_parent", ! L"invisible", WS_POPUP, 0, 0, CW_USEDEFAULT, CW_USEDEFAULT, NULL, NULL, ! ::GetModuleHandle(NULL), NULL); ! if (!invisible_parent_m) ADOBE_THROW_LAST_ERROR; ! } } --- 1595,1617 ---- // child_id_m = event_dispatcher_m.subscribe(this); + + register_invisible_parent(invisible_parent_m); + } + + /****************************************************************************************************/ + + control_t::control_t(theme_t theme) : + control_m(0), uxtheme_type_m(0), theme_m(theme), default_window_proc_m(0), + child_id_m(0) + #ifndef NDEBUG + , placed_m(false) + #endif + { // ! // All controls *must* have a child id. // ! child_id_m = event_dispatcher_m.subscribe(this); ! register_invisible_parent(invisible_parent_m); } *************** *** 1671,1687 **** /****************************************************************************************************/ ! void control_t::set_bounds(const point_t& pos, const extents_t& geo) { assert(control_m); ! point_t position(pos); extents_t geometry(geo); RECT new_bounds = { ! position.first, ! position.second, ! position.first + geometry.width(), ! position.second + geometry.height() }; --- 1698,1714 ---- /****************************************************************************************************/ ! void control_t::set_bounds(const point_2d_t& pos, const extents_t& geo) { assert(control_m); ! point_2d_t position(pos); extents_t geometry(geo); RECT new_bounds = { ! position.x_m, ! position.y_m, ! position.x_m + geometry.width(), ! position.y_m + geometry.height() }; *************** *** 2439,2445 **** /****************************************************************************************************/ ! checkbox_t::implementation_t::implementation_t() : ! is_checked_m(false) { } --- 2466,2476 ---- /****************************************************************************************************/ ! checkbox_t::implementation_t::implementation_t( const std::string& name, ! adobe::value_t true_value, ! adobe::value_t false_value, ! theme_t theme) : ! _super(theme), true_value_m(true_value), false_value_m(false_value) { + initialize(initial_bounds_g, name); } *************** *** 2447,2451 **** checkbox_t::implementation_t::implementation_t(const implementation_t& rhs) : ! _super(rhs), is_checked_m(rhs.is_checked_m) { RECT bounds = { 0 }; --- 2478,2483 ---- checkbox_t::implementation_t::implementation_t(const implementation_t& rhs) : ! _super(rhs), true_value_m(rhs.true_value_m), false_value_m(rhs.false_value_m), ! current_value_m(rhs.current_value_m) { RECT bounds = { 0 }; *************** *** 2469,2473 **** control_m = ::CreateWindowEx( WS_EX_COMPOSITED, "BUTTON", name.c_str(), ! WS_CHILD | WS_VISIBLE | BS_CHECKBOX | WS_TABSTOP | BS_NOTIFY, bounds.left, bounds.top, width, height, invisible_parent_m, --- 2501,2505 ---- control_m = ::CreateWindowEx( WS_EX_COMPOSITED, "BUTTON", name.c_str(), ! WS_CHILD | WS_VISIBLE | BS_3STATE | WS_TABSTOP | BS_NOTIFY, bounds.left, bounds.top, width, height, invisible_parent_m, *************** *** 2477,2495 **** if (control_m == NULL) ADOBE_THROW_LAST_ERROR; #ifndef NDEBUG set_user_reference(control_m, this); trap_window_proc(control_window_proc); #endif } /****************************************************************************************************/ ! void checkbox_t::implementation_t::set_value(std::size_t is_checked) { assert(control_m); ! is_checked_m = is_checked; ! ::SendMessage(control_m, BM_SETCHECK, is_checked_m ? BST_CHECKED : BST_UNCHECKED, 0); } --- 2509,2544 ---- if (control_m == NULL) ADOBE_THROW_LAST_ERROR; + #ifndef NDEBUG set_user_reference(control_m, this); trap_window_proc(control_window_proc); #endif + + set_theme(theme_m); } /****************************************************************************************************/ ! extents_t checkbox_t::implementation_t::measure() ! { ! return _super::best_bounds(); ! } ! ! /****************************************************************************************************/ ! ! void checkbox_t::implementation_t::set_value(adobe::value_t new_value) { assert(control_m); ! if (current_value_m == new_value) return; ! current_value_m = new_value; ! ! WPARAM state(BST_INDETERMINATE); ! ! if (current_value_m == true_value_m) state = BST_CHECKED; ! else if (current_value_m == false_value_m) state = BST_UNCHECKED; ! ! ::SendMessage(control_m, BM_SETCHECK, state, 0); } *************** *** 2500,2504 **** assert(control_m); ! if (!hit_proc_m) hit_proc_m = proc; } --- 2549,2553 ---- assert(control_m); ! hit_proc_m = proc; } *************** *** 2521,2527 **** void checkbox_t::implementation_t::user_hit() { ! set_value(!is_checked_m); ! if (!hit_proc_m.empty()) hit_proc_m(modifiers_t(), is_checked_m); } --- 2570,2580 ---- void checkbox_t::implementation_t::user_hit() { ! adobe::value_t new_value(true_value_m); ! if (current_value_m == true_value_m) new_value = false_value_m; ! ! set_value(new_value); ! ! if (!hit_proc_m.empty()) hit_proc_m(new_value); } *************** *** 2626,2630 **** /****************************************************************************************************/ ! void link_t::implementation_t::set_bounds(const point_t& position, const extents_t& geometry) { assert(control_m); --- 2679,2683 ---- /****************************************************************************************************/ ! void link_t::implementation_t::set_bounds(const point_2d_t& position, const extents_t& geometry) { assert(control_m); *************** *** 3135,3143 **** /****************************************************************************************************/ ! void edit_text_t::implementation_t::set_bounds(const point_t& pos, const extents_t& geo) { assert(control_m); ! point_t position(pos); extents_t geometry(geo); --- 3188,3196 ---- /****************************************************************************************************/ ! void edit_text_t::implementation_t::set_bounds(const point_2d_t& pos, const extents_t& geo) { assert(control_m); ! point_2d_t position(pos); extents_t geometry(geo); *************** *** 3152,3156 **** // adobe::extents_t label_geometry; ! adobe::point_t label_position(position); // // We stored the height of the label in best_bounds. The width of --- 3205,3209 ---- // adobe::extents_t label_geometry; ! adobe::point_2d_t label_position(position); // // We stored the height of the label in best_bounds. The width of *************** *** 3164,3171 **** // edit widget. We stored the label's baseline in best_bounds. // ! label_position.second += baseline - static_baseline_m; get_label().set_bounds(label_position, label_geometry); ! position.first += label_geometry.width() + gap; geometry.width() -= label_geometry.width() + gap; } --- 3217,3224 ---- // edit widget. We stored the label's baseline in best_bounds. // ! label_position.y_m += baseline - static_baseline_m; get_label().set_bounds(label_position, label_geometry); ! position.x_m += label_geometry.width() + gap; geometry.width() -= label_geometry.width() + gap; } *************** *** 3174,3178 **** // alignment. // ! position.second += baseline - edit_baseline_m; geometry.height() = edit_height_m; _super::set_bounds(position, geometry); --- 3227,3231 ---- // alignment. // ! position.y_m += baseline - edit_baseline_m; geometry.height() = edit_height_m; _super::set_bounds(position, geometry); *************** *** 3204,3208 **** long left(bounds.left); extents_t rect; ! point_t position(left + left_adjust, top); rect.height() = bounds.bottom - bounds.top; --- 3257,3261 ---- long left(bounds.left); extents_t rect; ! point_2d_t position(left + left_adjust, top); rect.height() = bounds.bottom - bounds.top; *************** *** 3550,3558 **** /****************************************************************************************************/ ! void popup_t::implementation_t::set_bounds(const point_t& pos, const extents_t& geometry) { assert(control_m); ! point_t position(pos); geometry_m = geometry; // --- 3603,3611 ---- /****************************************************************************************************/ ! void popup_t::implementation_t::set_bounds(const point_2d_t& pos, const extents_t& geometry) { assert(control_m); ! point_2d_t position(pos); geometry_m = geometry; // *************** *** 3571,3575 **** // Apply the vertical offset. // ! point_t label_pos(pos.first, pos.second + (baseline - static_baseline_m)); // // The width of the label is the first horizontal --- 3624,3628 ---- // Apply the vertical offset. // ! point_2d_t label_pos(pos.x_m, pos.y_m + (baseline - static_baseline_m)); // // The width of the label is the first horizontal *************** *** 3589,3593 **** // long width = gap + label_size.width(); ! position.first += width; geometry_m.width() -= width; } --- 3642,3646 ---- // long width = gap + label_size.width(); ! position.x_m += width; geometry_m.width() -= width; } *************** *** 3623,3627 **** long top(bounds.top); long left(bounds.left); ! point_t position(left + left_adjust, top + top_adjust); extents_t rect; --- 3676,3680 ---- long top(bounds.top); long left(bounds.left); ! point_2d_t position(left + left_adjust, top + top_adjust); extents_t rect; *************** *** 3876,3887 **** /****************************************************************************************************/ ! void unit_edit_text_t::implementation_t::set_bounds(const point_t& pos, const extents_t& geometry) { assert(control_m); ! point_t position(pos); adobe::extents_t edit_geometry; adobe::extents_t copy_geometry(geometry); ! adobe::point_t edit_position(pos); long baseline(geometry.slice_m[extents_slices_t::vertical].poi_m[0]); // --- 3929,3940 ---- /****************************************************************************************************/ ! void unit_edit_text_t::implementation_t::set_bounds(const point_2d_t& pos, const extents_t& geometry) { assert(control_m); ! point_2d_t position(pos); adobe::extents_t edit_geometry; adobe::extents_t copy_geometry(geometry); ! adobe::point_2d_t edit_position(pos); long baseline(geometry.slice_m[extents_slices_t::vertical].poi_m[0]); // *************** *** 3918,3922 **** // adobe::extents_t popup_geometry; ! adobe::point_t popup_position(pos); popup_geometry.width() = copy_geometry.slice_m[extents_slices_t::horizontal].length_m - --- 3971,3975 ---- // adobe::extents_t popup_geometry; ! adobe::point_2d_t popup_position(pos); popup_geometry.width() = copy_geometry.slice_m[extents_slices_t::horizontal].length_m - *************** *** 3929,3938 **** // edit_geometry.width() -= popup_geometry.width() + gap; ! popup_position.first += edit_geometry.width() + gap; // // Apply any required vertical offset to the popup // position. // ! popup_position.second += baseline - popup_baseline_m; get_popup().set_bounds(popup_position, popup_geometry); --- 3982,3991 ---- // edit_geometry.width() -= popup_geometry.width() + gap; ! popup_position.x_m += edit_geometry.width() + gap; // // Apply any required vertical offset to the popup // position. // ! popup_position.y_m += baseline - popup_baseline_m; get_popup().set_bounds(popup_position, popup_geometry); *************** *** 3942,3946 **** // it. The position might have been shifted vertically. // ! edit_position.second += baseline - edit_baseline_m; _super::set_bounds(edit_position, edit_geometry); geometry_m = geometry; --- 3995,3999 ---- // it. The position might have been shifted vertically. // ! edit_position.y_m += baseline - edit_baseline_m; _super::set_bounds(edit_position, edit_geometry); geometry_m = geometry; *************** *** 4415,4419 **** /****************************************************************************************************/ ! void hitless_t::implementation_t::set_bounds(const point_t&, const extents_t&) { /* do nothing on Win for now */ --- 4468,4472 ---- /****************************************************************************************************/ ! void hitless_t::implementation_t::set_bounds(const point_2d_t&, const extents_t&) { /* do nothing on Win for now */ *************** *** 4467,4471 **** #ifndef NDEBUG ! void frame_geometry(window_t& window, const point_t& position, const extents_t& geometry) { #if 0 --- 4520,4524 ---- #ifndef NDEBUG ! void frame_extents(window_t& window, const point_2d_t& position, const extents_t& geometry) { #if 0 *************** *** 4500,4508 **** { ! points_of_interest_t::const_iterator iter(geometry.slice_m[extents_slices_t::horizontal].poi_m.begin()); ! points_of_interest_t::const_iterator last(geometry.slice_m[extents_slices_t::horizontal].poi_m.end()); for (; iter != last; ++iter) { ! points_of_interest_t::value_type cur(*iter); long poi(left + cur); CGRect top_tick(::CGRectMake(poi, top, 1, tick_height)); --- 4553,4561 ---- { ! guide_set_t::const_iterator iter(geometry.slice_m[extents_slices_t::horizontal].poi_m.begin()); ! guide_set_t::const_iterator last(geometry.slice_m[extents_slices_t::horizontal].poi_m.end()); for (; iter != last; ++iter) { ! guide_set_t::value_type cur(*iter); long poi(left + cur); CGRect top_tick(::CGRectMake(poi, top, 1, tick_height)); *************** *** 4515,4523 **** { ! points_of_interest_t::const_iterator iter(geometry.slice_m[extents_slices_t::vertical].poi_m.begin()); ! points_of_interest_t::const_iterator last(geometry.slice_m[extents_slices_t::vertical].poi_m.end()); for (; iter != last; ++iter) { ! points_of_interest_t::value_type cur(*iter); long poi(top + cur); CGRect left_tick(::CGRectMake(left, poi, tick_width, 1)); --- 4568,4576 ---- { ! guide_set_t::const_iterator iter(geometry.slice_m[extents_slices_t::vertical].poi_m.begin()); ! guide_set_t::const_iterator last(geometry.slice_m[extents_slices_t::vertical].poi_m.end()); for (; iter != last; ++iter) { ! guide_set_t::value_type cur(*iter); long poi(top + cur); CGRect left_tick(::CGRectMake(left, poi, tick_width, 1)); *************** *** 4540,4544 **** /****************************************************************************************************/ ! bool clear_geometry_frames(window_t& window) { hitless_t& hitless(window.implementation().framing_control_m); --- 4593,4597 ---- /****************************************************************************************************/ ! bool clear_extents_frames(window_t& window) { hitless_t& hitless(window.implementation().framing_control_m); |
|
From: Foster B. <fos...@us...> - 2005-04-19 23:05:14
|
Update of /cvsroot/adobe-source/sandbox/visual_refactor/adobe/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv782/adobe/source Modified Files: xstr.cpp Log Message: hex codes work in xml escape sequences now Index: xstr.cpp =================================================================== RCS file: /cvsroot/adobe-source/sandbox/visual_refactor/adobe/source/xstr.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** xstr.cpp 19 Apr 2005 20:59:32 -0000 1.2 --- xstr.cpp 19 Apr 2005 23:05:04 -0000 1.3 *************** *** 556,571 **** /*************************************************************************************************/ ! void translate_char(std::string& content, const char* first, const char* last) { ! std::string char_ref(first, last); ! ! if (char_ref[2] == 'x') ! { ! // REVISIT (fbrereto) : Process hex digits ! } ! else ! { ! content += std::string::value_type(std::atoi(first + 2)); ! } } --- 556,562 ---- /*************************************************************************************************/ ! void translate_char(double code, std::string& content) { ! content += std::string::value_type(code); } *************** *** 601,604 **** --- 592,596 ---- node_t cur_node; std::string cur_content; + double cur_num; // NOTE (fbrereto) : Naming conventions for these rules should follow XML 1.1 spec: *************** *** 808,812 **** reference = entity_ref[boost::bind(translate_entity, boost::ref(cur_content), _1, _2)] ! | char_ref[boost::bind(translate_char, boost::ref(cur_content), _1, _2)] ; --- 800,804 ---- reference = entity_ref[boost::bind(translate_entity, boost::ref(cur_content), _1, _2)] ! | char_ref[boost::bind(translate_char, boost::ref(cur_num), boost::ref(cur_content))] ; *************** *** 818,823 **** char_ref ! = "&#" >> +boost::spirit::digit_p >> ';' ! | "&#x" >> +boost::spirit::xdigit_p >> ';' ; --- 810,815 ---- char_ref ! = "&#" >> boost::spirit::uint_p[boost::spirit::assign_a(cur_num)] >> ';' ! | "&#x" >> boost::spirit::hex_p[boost::spirit::assign_a(cur_num)] >> ';' ; |
|
From: Foster B. <fos...@us...> - 2005-04-19 20:59:42
|
Update of /cvsroot/adobe-source/sandbox/visual_refactor/adobe/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32297/visual_refactor/adobe/source Modified Files: xstr.cpp Log Message: References added to xstr; hex references still need work though Index: xstr.cpp =================================================================== RCS file: /cvsroot/adobe-source/sandbox/visual_refactor/adobe/source/xstr.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** xstr.cpp 18 Apr 2005 21:15:44 -0000 1.1 --- xstr.cpp 19 Apr 2005 20:59:32 -0000 1.2 *************** *** 248,251 **** --- 248,252 ---- typedef store_t::value_type store_value_type; typedef std::pair<store_iterator, store_iterator> store_range_pair_t; + typedef std::map<adobe::name_t, const char*, name_less_t> entity_map_t; /*************************************************************************************************/ *************** *** 257,260 **** --- 258,262 ---- static store_t* xstr_store_g = 0; static node_t::attribute_set_t* default_context_g = 0; + static entity_map_t* entity_map_g = 0; /*************************************************************************************************/ *************** *** 330,333 **** --- 332,349 ---- xstr_store_g = &xstr_store_s; default_context_g = &default_context_s; + + // initialize the entity map + + static entity_map_t entity_map_s; + + entity_map_s[adobe::static_name_t("<")] = "<"; + entity_map_s[adobe::static_name_t(">")] = ">"; + entity_map_s[adobe::static_name_t("&")] = "&"; + entity_map_s[adobe::static_name_t("'")] = "\'"; + entity_map_s[adobe::static_name_t(""")] = "\""; + entity_map_s[adobe::static_name_t("©")] = "\xA9"; + entity_map_s[adobe::static_name_t("®")] = "\xAE"; + + entity_map_g = &entity_map_s; } *************** *** 514,517 **** --- 530,575 ---- /*************************************************************************************************/ + void commit_content(adobe::name_t& name, std::string& content) + { + name = adobe::name_t(content.c_str(), content.size()); + + content = std::string(); + } + + /*************************************************************************************************/ + + void append_content(std::string& content, const char* first, const char* last) + { + content += std::string(first, last); + } + + /*************************************************************************************************/ + + void translate_entity(std::string& content, const char* first, const char* last) + { + entity_map_t::const_iterator result(entity_map_g->find(adobe::name_t(first, last - first))); + + if (result != entity_map_g->end()) + content += result->second; + } + + /*************************************************************************************************/ + + void translate_char(std::string& content, const char* first, const char* last) + { + std::string char_ref(first, last); + + if (char_ref[2] == 'x') + { + // REVISIT (fbrereto) : Process hex digits + } + else + { + content += std::string::value_type(std::atoi(first + 2)); + } + } + + /*************************************************************************************************/ + void push_and_clear_node(node_set_t& node_set, node_t& new_node) { *************** *** 542,545 **** --- 600,604 ---- node_t::attribute_t cur_attribute; node_t cur_node; + std::string cur_content; // NOTE (fbrereto) : Naming conventions for these rules should follow XML 1.1 spec: *************** *** 561,564 **** --- 620,626 ---- boost::spirit::rule<> attribute; // http://www.w3.org/TR/2004/REC-xml11-20040204/#NT-Attribute boost::spirit::rule<> content; // http://www.w3.org/TR/2004/REC-xml11-20040204/#NT-content + boost::spirit::rule<> reference; // http://www.w3.org/TR/2004/REC-xml11-20040204/#NT-Reference + boost::spirit::rule<> entity_ref; // http://www.w3.org/TR/2004/REC-xml11-20040204/#NT-EntityRef + boost::spirit::rule<> char_ref; // http://www.w3.org/TR/2004/REC-xml11-20040204/#NT-CharRef boost::spirit::rule<> att_value; // http://www.w3.org/TR/2004/REC-xml11-20040204/#NT-AttValue *************** *** 595,598 **** --- 657,667 ---- }; + boost::spirit::error_status<> clear_cur_content() + { + cur_content = std::string(); + + return boost::spirit::error_status<>(boost::spirit::error_status<>::fail); + } + boost::spirit::guard<parser_error_t> guard_m; boost::spirit::assertion<parser_error_t> expect_open_token; *************** *** 649,653 **** element = ( s_tag ! >> content[boost::bind(assign_name, boost::ref(cur_node.value_m), _1, _2)] >> e_tag ) --- 718,722 ---- element = ( s_tag ! >> content[boost::bind(commit_content, boost::ref(cur_node.value_m), boost::ref(cur_content))] >> e_tag ) *************** *** 727,731 **** content ! = *( ( boost::spirit::space_p | boost::spirit::print_p ) - boost::spirit::ch_p('<') ) ; --- 796,823 ---- content ! = guard_m ! ( ! *( ! reference ! | (( boost::spirit::space_p | boost::spirit::print_p ) - boost::spirit::ch_p('<'))[boost::bind(append_content, boost::ref(cur_content), _1, _2)] ! ) ! )[boost::bind(clear_cur_content, boost::ref(*this))] ! ; ! ! ! reference ! = entity_ref[boost::bind(translate_entity, boost::ref(cur_content), _1, _2)] ! | char_ref[boost::bind(translate_char, boost::ref(cur_content), _1, _2)] ! ; ! ! ! entity_ref ! = '&' >> name >> ';' ! ; ! ! ! char_ref ! = "&#" >> +boost::spirit::digit_p >> ';' ! | "&#x" >> +boost::spirit::xdigit_p >> ';' ; |
|
From: Ralph T. <ra...@us...> - 2005-04-19 20:41:27
|
Update of /cvsroot/adobe-source/sandbox/visual_refactor/adobe/test/visual/headers In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23614/visual_refactor/adobe/test/visual/headers Added Files: factory.hpp Log Message: Initial idea of the public widget factory interface. --- NEW FILE: factory.hpp --- /* Copyright 2005 Ralph Thomas 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_UI_CORE_FACTORY_HPP #define ADOBE_UI_CORE_FACTORY_HPP /****************************************************************************************************/ #include "display.hpp" #include "ui_core.hpp" #include <adobe/future/assemblage.hpp> #include <adobe/dictionary.hpp> #include <adobe/eve_parser.hpp> /****************************************************************************************************/ // /// This file defines the factory functions which are used to create widgets specified by /// the Eve file. The main factory function "default_factory" can be passed to window_server_t /// as the factory function to create widgets. All it does is call the other factory functions /// defined here to create specific widgets. /// /// The motivation behind having the factory split out into a function for each widget, is that /// it should be really easy for application developers to add custom attributes in Eve for /// widgets that interest them. /// /// In order to avoid complexities with passing type information around, the factory methods all /// insert the widget they create into the given parent. They also register with the assemblage /// in the factory token to be destroyed when the assemblage is destroyed. // /****************************************************************************************************/ namespace adobe { /****************************************************************************************************/ // /// This structure is given to all factory functions, so that they can correctly create /// the widgets they need to create. // struct factory_token_t { factory_token_t() {} /* explicit factory_token_t(display_t& display, assemblage_t& assemblage, sheet_t& sheet) : display_m(display), assemblage_m(assemblage), sheet_m(sheet) {}*/ // /// Created widgets should be made with respect to this display, and inserted /// into the given parent by this display. // display_t* display_m; // /// This is the assemblage which widget factories register the created widget /// (or wrapping structure) with, such that the widget gets deleted when the /// assemblage does. // assemblage_t* assemblage_m; // /// The current Adam sheet -- this contains all of the cells which widgets might /// want to bind against. // sheet_t* sheet_m; }; /****************************************************************************************************/ // /// This is the main factory function. It will create the named widget (if possible) /// and insert it into the parent. If the widget named is unknown, or the parent is /// not valid then a std::runtime_error exception is thrown. /// /// \param name the name of the widget to create, like "button" or "checkbox". /// \param parameters a dictionary of paramters for the new widget. /// \param parent the parent widget for this new (child) widget. This parameter /// may be zero when creating top-level widgets, such as windows. /// \param token a factory token, containing appropriate references. /// /// \return the newly created widget. This opaque position_t should not need to /// be poked at by client code -- everything it needs to do should have /// been set up by this factory function (e.g.: binding to cells in the /// token's sheet). // eve::position_t default_factory(std::string name, const dictionary_t& parameters, eve::position_t parent, const factory_token_t& token); /****************************************************************************************************/ // /// Create a window widget with the given parameters, and insert it into the /// given parent. /// /// \param parameters a dictionary of parameters for the new window. /// \param parent the parent widget for this button, may be zero. /// \param token a factory token, containing approprate references. /// /// \return the newly created widget. This pointer will have been added to the /// assemblage's (in the token) list of things to delete, so it will /// not be valid after the assemblage has been released. // window_t* window_factory(const dictionary_t& parameters, eve::position_t parent, const factory_token_t& token); /****************************************************************************************************/ /// Create a group widget with the given parameters, and insert it into the /// given parent. /// /// \param parameters a dictionary of parameters for the new group. /// \param parent the parent widget for this button, may not be zero. /// \param token a factory token, containing approprate references. /// /// \return the newly created widget. This pointer will have been added to the /// assemblage's (in the token) list of things to delete, so it will /// not be valid after the assemblage has been released. // button_t* group_factory(const dictionary_t& parameters, eve::position_t parent, const factory_token_t& token); /****************************************************************************************************/ // /// Create a tab group widget with the given parameters, and insert it into the /// given parent. /// /// \param parameters a dictionary of parameters for the new tab group. /// \param parent the parent widget for this button, may not be zero. /// \param token a factory token, containing approprate references. /// /// \return the newly created widget. This pointer will have been added to the /// assemblage's (in the token) list of things to delete, so it will /// not be valid after the assemblage has been released. // tab_group_t* tab_group_factory(const dictionary_t& parameters, eve::position_t parent, const factory_token_t& token); /****************************************************************************************************/ // /// Create a button widget with the given parameters, and insert it into the /// given parent. /// /// \param parameters a dictionary of parameters for the new button. /// \param parent the parent widget for this button, may not be zero. /// \param token a factory token, containing approprate references. /// /// \return the newly created widget. This pointer will have been added to the /// assemblage's (in the token) list of things to delete, so it will /// not be valid after the assemblage has been released. // button_t* button_factory(const dictionary_t& parameters, eve::position_t parent, const factory_token_t& token); /****************************************************************************************************/ // /// Create a panel widget with the given parameters, and insert it into the /// given parent. /// /// \param parameters a dictionary of parameters for the new panel. /// \param parent the parent widget for this button, may not be zero. /// \param token a factory token, containing approprate references. /// /// \return the newly created widget. This pointer will have been added to the /// assemblage's (in the token) list of things to delete, so it will /// not be valid after the assemblage has been released. // panel_t* panel_factory(const dictionary_t& parameters, eve::position_t parent, const factory_token_t& token); /****************************************************************************************************/ // /// Create a radio button widget with the given parameters, and insert it into the /// given parent. /// /// \param parameters a dictionary of parameters for the new radio button. /// \param parent the parent widget for this button, may not be zero. /// \param token a factory token, containing approprate references. /// /// \return the newly created widget. This pointer will have been added to the /// assemblage's (in the token) list of things to delete, so it will /// not be valid after the assemblage has been released. // radio_button_t* radio_button_factory(const dictionary_t& parameters, eve::position_t parent, const factory_token_t& token); /****************************************************************************************************/ // /// Create a check box widget with the given parameters, and insert it into the /// given parent. /// /// \param parameters a dictionary of parameters for the new check box. /// \param parent the parent widget for this button, may not be zero. /// \param token a factory token, containing approprate references. /// /// \return the newly created widget. This pointer will have been added to the /// assemblage's (in the token) list of things to delete, so it will /// not be valid after the assemblage has been released. // checkbox_t* check_box_factory(const dictionary_t& parameters, eve::position_t parent, const factory_token_t& token); /****************************************************************************************************/ // /// Create a link widget with the given parameters, and insert it into the /// given parent. /// /// \param parameters a dictionary of parameters for the new link. /// \param parent the parent widget for this button, may not be zero. /// \param token a factory token, containing approprate references. /// /// \return the newly created widget. This pointer will have been added to the /// assemblage's (in the token) list of things to delete, so it will /// not be valid after the assemblage has been released. // link_t* link_factory(const dictionary_t& parameters, eve::position_t parent, const factory_token_t& token); /****************************************************************************************************/ // /// Create a progress bar widget with the given parameters, and insert it into the /// given parent. /// /// \param parameters a dictionary of parameters for the new progress bar. /// \param parent the parent widget for this button, may not be zero. /// \param token a factory token, containing approprate references. /// /// \return the newly created widget. This pointer will have been added to the /// assemblage's (in the token) list of things to delete, so it will /// not be valid after the assemblage has been released. // progress_bar_t* progress_bar_factory(const dictionary_t& parameters, eve::position_t parent, const factory_token_t& token); /****************************************************************************************************/ // /// Create a separator widget with the given parameters, and insert it into the /// given parent. /// /// \param parameters a dictionary of parameters for the new separator. /// \param parent the parent widget for this button, may not be zero. /// \param token a factory token, containing approprate references. /// /// \return the newly created widget. This pointer will have been added to the /// assemblage's (in the token) list of things to delete, so it will /// not be valid after the assemblage has been released. // separator_t* separator_factory(const dictionary_t& parameters, eve::position_t parent, const factory_token_t& token); /****************************************************************************************************/ // /// Create a static text widget with the given parameters, and insert it into the /// given parent. /// /// \param parameters a dictionary of parameters for the new static text. /// \param parent the parent widget for this button, may not be zero. /// \param token a factory token, containing approprate references. /// /// \return the newly created widget. This pointer will have been added to the /// assemblage's (in the token) list of things to delete, so it will /// not be valid after the assemblage has been released. // static_text_t* static_text_factory(const dictionary_t& parameters, eve::position_t parent, const factory_token_t& token); /****************************************************************************************************/ // /// Create a edit text widget with the given parameters, and insert it into the /// given parent. /// /// \param parameters a dictionary of parameters for the new edit text. /// \param parent the parent widget for this button, may not be zero. /// \param token a factory token, containing approprate references. /// /// \return the newly created widget. This pointer will have been added to the /// assemblage's (in the token) list of things to delete, so it will /// not be valid after the assemblage has been released. // edit_text_t* edit_text_factory(const dictionary_t& parameters, eve::position_t parent, const factory_token_t& token); /****************************************************************************************************/ // /// Create a popup widget with the given parameters, and insert it into the /// given parent. /// /// \param parameters a dictionary of parameters for the new popup. /// \param parent the parent widget for this button, may not be zero. /// \param token a factory token, containing approprate references. /// /// \return the newly created widget. This pointer will have been added to the /// assemblage's (in the token) list of things to delete, so it will /// not be valid after the assemblage has been released. // popup_t* popup_factory(const dictionary_t& parameters, eve::position_t parent, const factory_token_t& token); /****************************************************************************************************/ // /// Create a unit edit text widget with the given parameters, and insert it into the /// given parent. /// /// \param parameters a dictionary of parameters for the new unit edit text. /// \param parent the parent widget for this button, may not be zero. /// \param token a factory token, containing approprate references. /// /// \return the newly created widget. This pointer will have been added to the /// assemblage's (in the token) list of things to delete, so it will /// not be valid after the assemblage has been released. // unit_edit_text_t* unit_edit_text_factory(const dictionary_t& parameters, eve::position_t parent, const factory_token_t& token); /****************************************************************************************************/ // /// Create a slider widget with the given parameters, and insert it into the /// given parent. /// /// \param parameters a dictionary of parameters for the new slider. /// \param parent the parent widget for this button, may not be zero. /// \param token a factory token, containing approprate references. /// /// \return the newly created widget. This pointer will have been added to the /// assemblage's (in the token) list of things to delete, so it will /// not be valid after the assemblage has been released. // slider_t* slider_factory(const dictionary_t& parameters, eve::position_t parent, const factory_token_t& token); /****************************************************************************************************/ // /// Create a bevel button widget with the given parameters, and insert it into the /// given parent. /// /// \param parameters a dictionary of parameters for the new bevel button. /// \param parent the parent widget for this button, may not be zero. /// \param token a factory token, containing approprate references. /// /// \return the newly created widget. This pointer will have been added to the /// assemblage's (in the token) list of things to delete, so it will /// not be valid after the assemblage has been released. // bevel_button_t* bevel_button_factory(const dictionary_t& parameters, eve::position_t parent, const factory_token_t& token); /****************************************************************************************************/ } /****************************************************************************************************/ #endif /****************************************************************************************************/ |
|
From: Foster B. <fos...@us...> - 2005-04-19 17:56:41
|
Update of /cvsroot/adobe-source/sandbox/visual_refactor/adobe/test/visual/headers/mac In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32418/adobe/test/visual/headers/mac Modified Files: ui_core_implementation.hpp Log Message: rectangle now extents; started work on the ui_core, client_assembler API cleanup Index: ui_core_implementation.hpp =================================================================== RCS file: /cvsroot/adobe-source/sandbox/visual_refactor/adobe/test/visual/headers/mac/ui_core_implementation.hpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ui_core_implementation.hpp 18 Apr 2005 21:16:03 -0000 1.1 --- ui_core_implementation.hpp 19 Apr 2005 17:55:56 -0000 1.2 *************** *** 16,20 **** #include <adobe/future/memory.hpp> ! #include <adobe/rectangle.hpp> #include <adobe/dictionary.hpp> #include <adobe/array.hpp> --- 16,20 ---- #include <adobe/future/memory.hpp> ! #include <adobe/extents.hpp> #include <adobe/dictionary.hpp> #include <adobe/array.hpp> *************** *** 133,147 **** -# Resultant frame is set from <code>frame</code> -# Resultant inset is set from <code>inset</code> ! -# The resultant geometry is returned \subsection widget_metrics_mac_pipeline_placement Placement Pipeline ! -# <code>adjust_position.left - geometry.outset.left</code> is added to the left position of the widget ! -# <code>adjust_position.top - geometry.outset.top</code> is added to the top position of the widget -# The height of the widget is increased by ! <code>adjust_size.height + geometry.outset.top + geometry.outset.bottom</code> -# The width of the widget is increased by ! <code>adjust_size.width + geometry.outset.left + geometry.outset.right</code> -# The bounds of the widget are set */ --- 133,147 ---- -# Resultant frame is set from <code>frame</code> -# Resultant inset is set from <code>inset</code> ! -# The resultant extents is returned \subsection widget_metrics_mac_pipeline_placement Placement Pipeline ! -# <code>adjust_position.left - extents.outset.left</code> is added to the left position of the widget ! -# <code>adjust_position.top - extents.outset.top</code> is added to the top position of the widget -# The height of the widget is increased by ! <code>adjust_size.height + extents.outset.top + extents.outset.bottom</code> -# The width of the widget is increased by ! <code>adjust_size.width + extents.outset.left + extents.outset.right</code> -# The bounds of the widget are set */ *************** *** 224,228 **** #ifndef NDEBUG ! struct hitless_t : boost::totally_ordered<hitless_t> { struct implementation_t; --- 224,228 ---- #ifndef NDEBUG ! struct hitless_t : boost::equality_comparable<hitless_t> { struct implementation_t; *************** *** 235,245 **** void initialize(window_t& window); ! void set_bounds(const point_t& position, const rectangle_t& geometry); private: ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_FRIEND_DECLARATION(adobe::hitless_t); ! friend void frame_geometry(window_t& window, const point_t& position, const rectangle_t& geometry); ! friend bool clear_geometry_frames(window_t& window); implementation_t* object_m; --- 235,245 ---- void initialize(window_t& window); ! void set_bounds(const point_2d_t& position, const extents_t& extents); private: ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::hitless_t); ! friend void frame_extents(window_t& window, const point_2d_t& position, const extents_t& extents); ! friend bool clear_extents_frames(window_t& window); implementation_t* object_m; *************** *** 253,266 **** /****************************************************************************************************/ ! struct control_t : boost::totally_ordered<control_t> { control_t(); control_t(const control_t& rhs); virtual ~control_t(); ! virtual rectangle_t best_bounds(); ! void set_bounds(const point_t& position, const rectangle_t& geometry); void set_name(const std::string& name); virtual void set_theme(theme_t theme); --- 253,267 ---- /****************************************************************************************************/ ! struct control_t : boost::equality_comparable<control_t> { control_t(); + control_t(theme_t theme); control_t(const control_t& rhs); virtual ~control_t(); ! virtual extents_t best_bounds(); ! void set_bounds(const point_2d_t& position, const extents_t& extents); void set_name(const std::string& name); virtual void set_theme(theme_t theme); *************** *** 276,280 **** void set_value(long value); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_FRIEND_DECLARATION(adobe::control_t); virtual dictionary_t essentials() const; --- 277,281 ---- void set_value(long value); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::control_t); virtual dictionary_t essentials() const; *************** *** 292,296 **** implementation::control_focus_proc_t focus_proc_m; EventHandlerRef focus_callback_ref_m; ! rectangle_t geometry_m; // saving set_bounds param for essentials metric_extractor_t metrics_m; }; --- 293,297 ---- implementation::control_focus_proc_t focus_proc_m; EventHandlerRef focus_callback_ref_m; ! extents_t extents_m; // saving set_bounds param for essentials metric_extractor_t metrics_m; }; *************** *** 298,302 **** /****************************************************************************************************/ ! struct window_t::implementation_t : boost::totally_ordered<window_t::implementation_t> { implementation_t(); --- 299,303 ---- /****************************************************************************************************/ ! struct window_t::implementation_t : boost::equality_comparable<window_t::implementation_t> { implementation_t(); *************** *** 317,321 **** WindowModality modality); ! void set_bounds(const point_t& position, const rectangle_t& geometry); void reposition(window_reposition_t position); void set_visible(bool make_visible); --- 318,322 ---- WindowModality modality); ! void set_bounds(const point_2d_t& position, const extents_t& extents); void reposition(window_reposition_t position); void set_visible(bool make_visible); *************** *** 323,327 **** void signal_resize_complete(const implementation::window_resize_complete_proc_t& proc); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_FRIEND_DECLARATION(adobe::window_t::implementation_t); dictionary_t essentials() const; --- 324,328 ---- void signal_resize_complete(const implementation::window_resize_complete_proc_t& proc); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::window_t::implementation_t); dictionary_t essentials() const; *************** *** 329,333 **** WindowRef window_m; control_t root_control_m; ! rectangle_t geometry_m; // saving set_bounds param for essentials implementation::window_resize_complete_proc_t resize_complete_proc_m; #ifndef NDEBUG --- 330,334 ---- WindowRef window_m; control_t root_control_m; ! extents_t extents_m; // saving set_bounds param for essentials implementation::window_resize_complete_proc_t resize_complete_proc_m; #ifndef NDEBUG *************** *** 364,372 **** const std::string& name); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_FRIEND_DECLARATION(adobe::group_t::implementation_t); virtual dictionary_t essentials() const; ! virtual rectangle_t best_bounds(); }; --- 365,373 ---- const std::string& name); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::group_t::implementation_t); virtual dictionary_t essentials() const; ! virtual extents_t best_bounds(); }; *************** *** 385,393 **** const tab_group_t::tab_t* last); virtual void set_theme(theme_t theme); ! virtual rectangle_t best_bounds(); void set_value(const value_t& new_value); void signal_value_change(const implementation::tab_group_value_proc_t& proc); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_FRIEND_DECLARATION(adobe::tab_group_t::implementation_t); virtual dictionary_t essentials() const; --- 386,394 ---- const tab_group_t::tab_t* last); virtual void set_theme(theme_t theme); ! virtual extents_t best_bounds(); void set_value(const value_t& new_value); void signal_value_change(const implementation::tab_group_value_proc_t& proc); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::tab_group_t::implementation_t); virtual dictionary_t essentials() const; *************** *** 406,410 **** implementation_t(const implementation_t& rhs); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_FRIEND_DECLARATION(adobe::panel_t::implementation_t); virtual dictionary_t essentials() const; --- 407,411 ---- implementation_t(const implementation_t& rhs); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::panel_t::implementation_t); virtual dictionary_t essentials() const; *************** *** 428,432 **** const button_t::state_descriptor_t* first, const button_t::state_descriptor_t* last); ! virtual rectangle_t best_bounds(); void set_default(bool is_default); void set_cancel(bool is_cancel); --- 429,433 ---- const button_t::state_descriptor_t* first, const button_t::state_descriptor_t* last); ! virtual extents_t best_bounds(); void set_default(bool is_default); void set_cancel(bool is_cancel); *************** *** 434,438 **** void set_contributing(modifiers_t modifiers, const dictionary_t& value); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_FRIEND_DECLARATION(adobe::button_t::implementation_t); virtual dictionary_t essentials() const; --- 435,439 ---- void set_contributing(modifiers_t modifiers, const dictionary_t& value); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::button_t::implementation_t); virtual dictionary_t essentials() const; *************** *** 452,459 **** void initialize(const Rect& bounds, const std::string& name); ! virtual rectangle_t best_bounds(); void signal_hit(const implementation::radio_button_hit_proc_t& proc); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_FRIEND_DECLARATION(adobe::radio_button_t::implementation_t); virtual dictionary_t essentials() const; --- 453,460 ---- void initialize(const Rect& bounds, const std::string& name); ! virtual extents_t best_bounds(); void signal_hit(const implementation::radio_button_hit_proc_t& proc); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::radio_button_t::implementation_t); virtual dictionary_t essentials() const; *************** *** 468,483 **** typedef control_t _super; ! implementation_t(); implementation_t(const implementation_t& rhs); ! void initialize(const Rect& bounds, const std::string& name); ! virtual rectangle_t best_bounds(); ! void signal_hit(const implementation::radio_button_hit_proc_t& proc); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_FRIEND_DECLARATION(adobe::checkbox_t::implementation_t); virtual dictionary_t essentials() const; ! implementation::checkbox_hit_proc_t hit_proc_m; }; --- 469,494 ---- typedef control_t _super; ! implementation_t( const std::string& name, ! adobe::value_t true_value, ! adobe::value_t false_value, ! theme_t theme); ! implementation_t(const implementation_t& rhs); ! virtual extents_t measure(); ! void set_bounds(const point_2d_t& position, const extents_t& extents); ! ! void set_value(adobe::value_t value); ! ! void signal_hit(const implementation::checkbox_hit_proc_t& proc); ! ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::checkbox_t::implementation_t); virtual dictionary_t essentials() const; ! implementation::checkbox_hit_proc_t hit_proc_m; ! adobe::value_t true_value_m; ! adobe::value_t false_value_m; }; *************** *** 492,496 **** void initialize(const Rect& bounds); ! void set_bounds(const point_t& position, const rectangle_t& geometry); void set_value(bool value); void set_visible(bool make_visible); --- 503,507 ---- void initialize(const Rect& bounds); ! void set_bounds(const point_2d_t& position, const extents_t& extents); void set_value(bool value); void set_visible(bool make_visible); *************** *** 498,507 **** void signal_hit(const implementation::link_hit_proc_t& proc); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_FRIEND_DECLARATION(adobe::link_t::implementation_t); virtual dictionary_t essentials() const; implementation::link_hit_proc_t hit_proc_m; ! points_of_interest_t prongs_m; bool value_m; bool visible_m; --- 509,518 ---- void signal_hit(const implementation::link_hit_proc_t& proc); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::link_t::implementation_t); virtual dictionary_t essentials() const; implementation::link_hit_proc_t hit_proc_m; ! guide_set_t prongs_m; bool value_m; bool visible_m; *************** *** 521,527 **** pb_style_t bar_style, bool is_vertical); ! virtual rectangle_t best_bounds(); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_FRIEND_DECLARATION(adobe::progress_bar_t::implementation_t); virtual dictionary_t essentials() const; --- 532,538 ---- pb_style_t bar_style, bool is_vertical); ! virtual extents_t best_bounds(); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::progress_bar_t::implementation_t); virtual dictionary_t essentials() const; *************** *** 540,544 **** implementation_t(const implementation_t& rhs); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_FRIEND_DECLARATION(adobe::separator_t::implementation_t); virtual dictionary_t essentials() const; --- 551,555 ---- implementation_t(const implementation_t& rhs); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::separator_t::implementation_t); virtual dictionary_t essentials() const; *************** *** 557,566 **** void initialize(const Rect& bounds, const std::string& name); ! virtual rectangle_t best_bounds(); long best_height_given_width(long width); void set_name(const std::string& name); void signal_hit(const implementation::static_text_hit_proc_t& proc); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_FRIEND_DECLARATION(adobe::static_text_t::implementation_t); virtual dictionary_t essentials() const; --- 568,577 ---- void initialize(const Rect& bounds, const std::string& name); ! virtual extents_t best_bounds(); long best_height_given_width(long width); void set_name(const std::string& name); void signal_hit(const implementation::static_text_hit_proc_t& proc); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::static_text_t::implementation_t); virtual dictionary_t essentials() const; *************** *** 586,591 **** long rows); static_text_t& get_label(); ! virtual rectangle_t best_bounds(); ! void set_bounds(const point_t& position, const rectangle_t& geometry); void set_active(bool active); virtual void set_theme(theme_t theme); --- 597,602 ---- long rows); static_text_t& get_label(); ! virtual extents_t best_bounds(); ! void set_bounds(const point_2d_t& position, const extents_t& extents); void set_active(bool active); virtual void set_theme(theme_t theme); *************** *** 598,602 **** void signal_label_hit(const implementation::edit_text_label_hit_proc_t& proc); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_FRIEND_DECLARATION(adobe::edit_text_t::implementation_t); virtual dictionary_t essentials() const; --- 609,613 ---- void signal_label_hit(const implementation::edit_text_label_hit_proc_t& proc); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::edit_text_t::implementation_t); virtual dictionary_t essentials() const; *************** *** 633,637 **** void initialize(const Rect& bounds, const std::string& name); ! virtual rectangle_t best_bounds(); void set_active(bool active); virtual void set_theme(theme_t theme); --- 644,648 ---- void initialize(const Rect& bounds, const std::string& name); ! virtual extents_t best_bounds(); void set_active(bool active); virtual void set_theme(theme_t theme); *************** *** 644,648 **** void signal_value_change(const implementation::popup_value_proc_t& proc); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_FRIEND_DECLARATION(adobe::popup_t::implementation_t); virtual dictionary_t essentials() const; --- 655,659 ---- void signal_value_change(const implementation::popup_value_proc_t& proc); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::popup_t::implementation_t); virtual dictionary_t essentials() const; *************** *** 670,675 **** popup_t& get_popup(); edit_text_t& get_edit_text(); ! virtual rectangle_t best_bounds(); ! void set_bounds(const point_t& position, const rectangle_t& geometry); void set_active(bool active); virtual void set_theme(theme_t theme); --- 681,686 ---- popup_t& get_popup(); edit_text_t& get_edit_text(); ! virtual extents_t best_bounds(); ! void set_bounds(const point_2d_t& position, const extents_t& extents); void set_active(bool active); virtual void set_theme(theme_t theme); *************** *** 701,705 **** void signal_focus(const implementation::control_focus_proc_t& proc); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_FRIEND_DECLARATION(adobe::unit_edit_text_t::implementation_t); virtual dictionary_t essentials() const; --- 712,716 ---- void signal_focus(const implementation::control_focus_proc_t& proc); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::unit_edit_text_t::implementation_t); virtual dictionary_t essentials() const; *************** *** 731,735 **** void signal_value_change(const implementation::slider_value_proc_t& proc); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_FRIEND_DECLARATION(adobe::slider_t::implementation_t); virtual dictionary_t essentials() const; --- 742,746 ---- void signal_value_change(const implementation::slider_value_proc_t& proc); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::slider_t::implementation_t); virtual dictionary_t essentials() const; *************** *** 763,767 **** void signal_value_change(const implementation::bevel_button_popup_value_proc_t& proc); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_FRIEND_DECLARATION(adobe::bevel_button_t::implementation_t); virtual dictionary_t essentials() const; --- 774,778 ---- void signal_value_change(const implementation::bevel_button_popup_value_proc_t& proc); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::bevel_button_t::implementation_t); virtual dictionary_t essentials() const; *************** *** 817,821 **** void overlay_bounds_update(); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_FRIEND_DECLARATION(adobe::hitless_t::implementation_t); virtual dictionary_t essentials() const; --- 828,832 ---- void overlay_bounds_update(); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::hitless_t::implementation_t); virtual dictionary_t essentials() const; *************** *** 829,851 **** /****************************************************************************************************/ ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DECLARATION(adobe::window_t::implementation_t); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DECLARATION(adobe::control_t); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DECLARATION(adobe::group_t::implementation_t); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DECLARATION(adobe::tab_group_t::implementation_t); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DECLARATION(adobe::button_t::implementation_t); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DECLARATION(adobe::panel_t::implementation_t); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DECLARATION(adobe::radio_button_t::implementation_t); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DECLARATION(adobe::checkbox_t::implementation_t); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DECLARATION(adobe::link_t::implementation_t); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DECLARATION(adobe::progress_bar_t::implementation_t); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DECLARATION(adobe::separator_t::implementation_t); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DECLARATION(adobe::static_text_t::implementation_t); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DECLARATION(adobe::edit_text_t::implementation_t); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DECLARATION(adobe::popup_t::implementation_t); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DECLARATION(adobe::unit_edit_text_t::implementation_t); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DECLARATION(adobe::slider_t::implementation_t); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DECLARATION(adobe::bevel_button_t::implementation_t); #ifndef NDEBUG ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DECLARATION(adobe::hitless_t::implementation_t); #endif // NDEBUG --- 840,862 ---- /****************************************************************************************************/ ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DECLARATION(adobe::window_t::implementation_t); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DECLARATION(adobe::control_t); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DECLARATION(adobe::group_t::implementation_t); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DECLARATION(adobe::tab_group_t::implementation_t); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DECLARATION(adobe::button_t::implementation_t); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DECLARATION(adobe::panel_t::implementation_t); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DECLARATION(adobe::radio_button_t::implementation_t); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DECLARATION(adobe::checkbox_t::implementation_t); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DECLARATION(adobe::link_t::implementation_t); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DECLARATION(adobe::progress_bar_t::implementation_t); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DECLARATION(adobe::separator_t::implementation_t); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DECLARATION(adobe::static_text_t::implementation_t); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DECLARATION(adobe::edit_text_t::implementation_t); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DECLARATION(adobe::popup_t::implementation_t); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DECLARATION(adobe::unit_edit_text_t::implementation_t); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DECLARATION(adobe::slider_t::implementation_t); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DECLARATION(adobe::bevel_button_t::implementation_t); #ifndef NDEBUG ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DECLARATION(adobe::hitless_t::implementation_t); #endif // NDEBUG |
|
From: Foster B. <fos...@us...> - 2005-04-19 17:56:39
|
Update of /cvsroot/adobe-source/sandbox/visual_refactor/adobe/test/visual/sources/mac In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32418/adobe/test/visual/sources/mac Modified Files: ui_core_implementation.cpp Log Message: rectangle now extents; started work on the ui_core, client_assembler API cleanup Index: ui_core_implementation.cpp =================================================================== RCS file: /cvsroot/adobe-source/sandbox/visual_refactor/adobe/test/visual/sources/mac/ui_core_implementation.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ui_core_implementation.cpp 18 Apr 2005 21:16:05 -0000 1.1 --- ui_core_implementation.cpp 19 Apr 2005 17:55:59 -0000 1.2 *************** *** 281,285 **** /****************************************************************************************************/ ! adobe::dictionary_t rectangle_slice_to_dictionary(const adobe::rectangle_t::slice_t& s) { adobe::dictionary_t result; --- 281,285 ---- /****************************************************************************************************/ ! adobe::dictionary_t extents_slice_to_dictionary(const adobe::extents_t::slice_t& s) { [...1278 lines suppressed...] ! guide_set_t::const_iterator iter(extents.vertical().poi_m.begin()); ! guide_set_t::const_iterator last(extents.vertical().poi_m.end()); for (; iter != last; ++iter) { ! guide_set_t::value_type cur(*iter); long poi(top + cur); CGRect left_tick(::CGRectMake(left, poi, tick_width, 1)); *************** *** 4951,4955 **** /****************************************************************************************************/ ! bool clear_geometry_frames(window_t& window) { hitless_t& hitless(window.implementation().framing_control_m); --- 5016,5020 ---- /****************************************************************************************************/ ! bool clear_extents_frames(window_t& window) { hitless_t& hitless(window.implementation().framing_control_m); |
|
From: Foster B. <fos...@us...> - 2005-04-19 17:56:38
|
Update of /cvsroot/adobe-source/sandbox/visual_refactor/adobe/test/visual/sources In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32418/adobe/test/visual/sources Modified Files: client_assembler.cpp ui_core.cpp ui_core_common.cpp Log Message: rectangle now extents; started work on the ui_core, client_assembler API cleanup Index: ui_core_common.cpp =================================================================== RCS file: /cvsroot/adobe-source/sandbox/visual_refactor/adobe/test/visual/sources/ui_core_common.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ui_core_common.cpp 18 Apr 2005 21:16:05 -0000 1.1 --- ui_core_common.cpp 19 Apr 2005 17:55:59 -0000 1.2 *************** *** 17,21 **** /****************************************************************************************************/ ! void align_slices(::adobe::rectangle_t::slice_t& slice_one, ::adobe::rectangle_t::slice_t slice_two) { // --- 17,21 ---- /****************************************************************************************************/ ! void align_slices(::adobe::extents_t::slice_t& slice_one, ::adobe::extents_t::slice_t slice_two) { // Index: ui_core.cpp =================================================================== RCS file: /cvsroot/adobe-source/sandbox/visual_refactor/adobe/test/visual/sources/ui_core.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ui_core.cpp 18 Apr 2005 21:16:05 -0000 1.1 --- ui_core.cpp 19 Apr 2005 17:55:59 -0000 1.2 *************** *** 125,129 **** } ! void window_t::set_bounds(const point_t& position, const rectangle_t& geometry) { object_m->set_bounds(position, geometry); } --- 125,129 ---- } ! void window_t::set_bounds(const point_2d_t& position, const extents_t& geometry) { object_m->set_bounds(position, geometry); } *************** *** 162,169 **** { object_m->initialize(initial_bounds_g, name); } ! rectangle_t group_t::best_bounds() { return object_m->best_bounds(); } ! void group_t::set_bounds(const point_t& position, const rectangle_t& geometry) { object_m->set_bounds(position, geometry); } --- 162,169 ---- { object_m->initialize(initial_bounds_g, name); } ! extents_t group_t::best_bounds() { return object_m->best_bounds(); } ! void group_t::set_bounds(const point_2d_t& position, const extents_t& geometry) { object_m->set_bounds(position, geometry); } *************** *** 208,215 **** { object_m->initialize(initial_bounds_g, first, last); } ! rectangle_t tab_group_t::best_bounds() { return object_m->best_bounds(); } ! void tab_group_t::set_bounds(const point_t& position, const rectangle_t& geometry) { object_m->set_bounds(position, geometry); } --- 208,215 ---- { object_m->initialize(initial_bounds_g, first, last); } ! extents_t tab_group_t::best_bounds() { return object_m->best_bounds(); } ! void tab_group_t::set_bounds(const point_2d_t& position, const extents_t& geometry) { object_m->set_bounds(position, geometry); } *************** *** 257,261 **** { object_m->initialize(initial_bounds_g); } ! void panel_t::set_bounds(const point_t& position, const rectangle_t& geometry) { object_m->set_bounds(position, geometry); } --- 257,261 ---- { object_m->initialize(initial_bounds_g); } ! void panel_t::set_bounds(const point_2d_t& position, const extents_t& geometry) { object_m->set_bounds(position, geometry); } *************** *** 288,295 **** { object_m->initialize(initial_bounds_g, first, last); } ! rectangle_t button_t::best_bounds() { return object_m->best_bounds(); } ! void button_t::set_bounds(const point_t& position, const rectangle_t& geometry) { object_m->set_bounds(position, geometry); } --- 288,295 ---- { object_m->initialize(initial_bounds_g, first, last); } ! extents_t button_t::best_bounds() { return object_m->best_bounds(); } ! void button_t::set_bounds(const point_2d_t& position, const extents_t& geometry) { object_m->set_bounds(position, geometry); } *************** *** 352,359 **** { object_m->initialize(initial_bounds_g, name); } ! rectangle_t radio_button_t::best_bounds() { return object_m->best_bounds(); } ! void radio_button_t::set_bounds(const point_t& position, const rectangle_t& geometry) { object_m->set_bounds(position, geometry); } --- 352,359 ---- { object_m->initialize(initial_bounds_g, name); } ! extents_t radio_button_t::best_bounds() { return object_m->best_bounds(); } ! void radio_button_t::set_bounds(const point_2d_t& position, const extents_t& geometry) { object_m->set_bounds(position, geometry); } *************** *** 396,401 **** /****************************************************************************************************/ ! checkbox_t::checkbox_t() : ! object_m(new implementation_t()) { } --- 396,404 ---- /****************************************************************************************************/ ! checkbox_t::checkbox_t( const std::string& name, ! adobe::value_t true_value, ! adobe::value_t false_value, ! theme_t theme) : ! object_m(new implementation_t(name, true_value, false_value, theme)) { } *************** *** 407,446 **** { delete object_m; } ! void checkbox_t::initialize(const std::string& name) ! { object_m->initialize(initial_bounds_g, name); } ! ! rectangle_t checkbox_t::best_bounds() ! { return object_m->best_bounds(); } ! ! void checkbox_t::set_bounds(const point_t& position, const rectangle_t& geometry) ! { object_m->set_bounds(position, geometry); } ! ! void checkbox_t::set_name(const std::string& name) ! { object_m->set_name(name); } ! ! void checkbox_t::set_theme(theme_t theme) ! { object_m->set_theme(theme); } ! ! void checkbox_t::adorn_theme(theme_t theme) ! { object_m->adorn_theme(theme); } ! void checkbox_t::unadorn_theme(theme_t theme) ! { object_m->unadorn_theme(theme); } void checkbox_t::set_active(bool active) { return object_m->set_active(active); } ! void checkbox_t::set_visible(bool make_visible) ! { object_m->set_visible(make_visible); } ! ! void checkbox_t::set_focused(bool make_focused) ! { object_m->set_focused(make_focused); } ! ! void checkbox_t::set_value(bool value) { object_m->set_value(value); } - void checkbox_t::signal_focus(implementation::control_focus_proc_t proc) - { return object_m->signal_focus(proc); } - void checkbox_t::signal_hit(implementation::checkbox_hit_proc_t proc) { return object_m->signal_hit(proc); } --- 410,425 ---- { delete object_m; } ! extents_t checkbox_t::measure() ! { return object_m->measure(); } ! void checkbox_t::set_bounds(const point_2d_t& position, const extents_t& extents) ! { object_m->set_bounds(position, extents); } void checkbox_t::set_active(bool active) { return object_m->set_active(active); } ! void checkbox_t::set_value(adobe::value_t value) { object_m->set_value(value); } void checkbox_t::signal_hit(implementation::checkbox_hit_proc_t proc) { return object_m->signal_hit(proc); } *************** *** 468,475 **** { object_m->initialize(initial_bounds_g); } ! rectangle_t link_t::best_bounds() { return object_m->best_bounds(); } ! void link_t::set_bounds(const point_t& position, const rectangle_t& geometry) { object_m->set_bounds(position, geometry); } --- 447,454 ---- { object_m->initialize(initial_bounds_g); } ! extents_t link_t::best_bounds() { return object_m->best_bounds(); } ! void link_t::set_bounds(const point_2d_t& position, const extents_t& geometry) { object_m->set_bounds(position, geometry); } *************** *** 517,524 **** { object_m->initialize(initial_bounds_g, bar_style, is_vertical); } ! rectangle_t progress_bar_t::best_bounds() { return object_m->best_bounds(); } ! void progress_bar_t::set_bounds(const point_t& position, const rectangle_t& geometry) { object_m->set_bounds(position, geometry); } --- 496,503 ---- { object_m->initialize(initial_bounds_g, bar_style, is_vertical); } ! extents_t progress_bar_t::best_bounds() { return object_m->best_bounds(); } ! void progress_bar_t::set_bounds(const point_2d_t& position, const extents_t& geometry) { object_m->set_bounds(position, geometry); } *************** *** 569,576 **** { object_m->initialize(initial_bounds_g); } ! rectangle_t separator_t::best_bounds() { return object_m->best_bounds(); } ! void separator_t::set_bounds(const point_t& position, const rectangle_t& geometry) { object_m->set_bounds(position, geometry); } --- 548,555 ---- { object_m->initialize(initial_bounds_g); } ! extents_t separator_t::best_bounds() { return object_m->best_bounds(); } ! void separator_t::set_bounds(const point_2d_t& position, const extents_t& geometry) { object_m->set_bounds(position, geometry); } *************** *** 600,607 **** { object_m->initialize(initial_bounds_g, name); } ! rectangle_t static_text_t::best_bounds() { return object_m->best_bounds(); } ! void static_text_t::set_bounds(const point_t& position, const rectangle_t& geometry) { object_m->set_bounds(position, geometry); } --- 579,586 ---- { object_m->initialize(initial_bounds_g, name); } ! extents_t static_text_t::best_bounds() { return object_m->best_bounds(); } ! void static_text_t::set_bounds(const point_2d_t& position, const extents_t& geometry) { object_m->set_bounds(position, geometry); } *************** *** 655,662 **** { object_m->initialize(initial_bounds_g, name, scrollable, cols, rows); } ! rectangle_t edit_text_t::best_bounds() { return object_m->best_bounds(); } ! void edit_text_t::set_bounds(const point_t& position, const rectangle_t& geometry) { object_m->set_bounds(position, geometry); } --- 634,641 ---- { object_m->initialize(initial_bounds_g, name, scrollable, cols, rows); } ! extents_t edit_text_t::best_bounds() { return object_m->best_bounds(); } ! void edit_text_t::set_bounds(const point_2d_t& position, const extents_t& geometry) { object_m->set_bounds(position, geometry); } *************** *** 725,732 **** { object_m->initialize(initial_bounds_g, name); } ! rectangle_t popup_t::best_bounds() { return object_m->best_bounds(); } ! void popup_t::set_bounds(const point_t& position, const rectangle_t& geometry) { object_m->set_bounds(position, geometry); } --- 704,711 ---- { object_m->initialize(initial_bounds_g, name); } ! extents_t popup_t::best_bounds() { return object_m->best_bounds(); } ! void popup_t::set_bounds(const point_2d_t& position, const extents_t& geometry) { object_m->set_bounds(position, geometry); } *************** *** 795,802 **** { object_m->initialize(initial_bounds_g, name, using_popup, cols, rows); } ! rectangle_t unit_edit_text_t::best_bounds() { return object_m->best_bounds(); } ! void unit_edit_text_t::set_bounds(const point_t& position, const rectangle_t& geometry) { object_m->set_bounds(position, geometry); } --- 774,781 ---- { object_m->initialize(initial_bounds_g, name, using_popup, cols, rows); } ! extents_t unit_edit_text_t::best_bounds() { return object_m->best_bounds(); } ! void unit_edit_text_t::set_bounds(const point_2d_t& position, const extents_t& geometry) { object_m->set_bounds(position, geometry); } *************** *** 874,881 **** { object_m->initialize(0, is_vertical, style, num_tick_marks); } ! rectangle_t slider_t::best_bounds() { return object_m->best_bounds(); } ! void slider_t::set_bounds(const point_t& position, const rectangle_t& geometry) { object_m->set_bounds(position, geometry); } --- 853,860 ---- { object_m->initialize(0, is_vertical, style, num_tick_marks); } ! extents_t slider_t::best_bounds() { return object_m->best_bounds(); } ! void slider_t::set_bounds(const point_2d_t& position, const extents_t& geometry) { object_m->set_bounds(position, geometry); } *************** *** 935,942 **** { object_m->initialize(initial_bounds_g, name, offset_contents, menu_points_right); } ! rectangle_t bevel_button_t::best_bounds() { return object_m->best_bounds(); } ! void bevel_button_t::set_bounds(const point_t& position, const rectangle_t& geometry) { object_m->set_bounds(position, geometry); } --- 914,921 ---- { object_m->initialize(initial_bounds_g, name, offset_contents, menu_points_right); } ! extents_t bevel_button_t::best_bounds() { return object_m->best_bounds(); } ! void bevel_button_t::set_bounds(const point_2d_t& position, const extents_t& geometry) { object_m->set_bounds(position, geometry); } *************** *** 1009,1013 **** { object_m->initialize(initial_bounds_g, window.implementation().window_m); } ! void hitless_t::set_bounds(const point_t& position, const rectangle_t& geometry) { object_m->set_bounds(position, geometry); } --- 988,992 ---- { object_m->initialize(initial_bounds_g, window.implementation().window_m); } ! void hitless_t::set_bounds(const point_2d_t& position, const extents_t& geometry) { object_m->set_bounds(position, geometry); } *************** *** 1023,1031 **** #if defined(ADOBE_SERIALIZATION) ! #define ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DEFINITION(type) \ bool operator == (const type& x, const type& y) \ { return *x.object_m == *y.object_m; } \ - bool operator < (const type& /*x*/, const type& /*y*/) \ - { return false; /*REVISIT (fbrereto) : What does this really mean?*/ /*x.object_m->essentials() < y.object_m->essentials();*/ } \ std::ostream& operator << (std::ostream& s, const type& x) \ { return s << *x.object_m; } --- 1002,1008 ---- #if defined(ADOBE_SERIALIZATION) ! #define ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DEFINITION(type) \ bool operator == (const type& x, const type& y) \ { return *x.object_m == *y.object_m; } \ std::ostream& operator << (std::ostream& s, const type& x) \ { return s << *x.object_m; } *************** *** 1033,1062 **** #else ! #define ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DEFINITION(type) \ bool operator == (const type& x, const type& y) \ ! { return *x.object_m == *y.object_m; } \ ! bool operator < (const type& /*x*/, const type& /*y*/) \ ! { return false; /*REVISIT (fbrereto) : What does this really mean?*/ /*x.object_m->essentials() < y.object_m->essentials();*/ } #endif ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DEFINITION(adobe::window_t); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DEFINITION(adobe::group_t); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DEFINITION(adobe::tab_group_t); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DEFINITION(adobe::button_t); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DEFINITION(adobe::panel_t); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DEFINITION(adobe::radio_button_t); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DEFINITION(adobe::checkbox_t); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DEFINITION(adobe::link_t); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DEFINITION(adobe::progress_bar_t); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DEFINITION(adobe::separator_t); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DEFINITION(adobe::static_text_t); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DEFINITION(adobe::edit_text_t); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DEFINITION(adobe::popup_t); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DEFINITION(adobe::unit_edit_text_t); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DEFINITION(adobe::slider_t); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DEFINITION(adobe::bevel_button_t); #ifndef NDEBUG ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DEFINITION(adobe::hitless_t); #endif // NDEBUG --- 1010,1037 ---- #else ! #define ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DEFINITION(type) \ bool operator == (const type& x, const type& y) \ ! { return *x.object_m == *y.object_m; } #endif ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DEFINITION(adobe::window_t); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DEFINITION(adobe::group_t); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DEFINITION(adobe::tab_group_t); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DEFINITION(adobe::button_t); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DEFINITION(adobe::panel_t); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DEFINITION(adobe::radio_button_t); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DEFINITION(adobe::checkbox_t); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DEFINITION(adobe::link_t); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DEFINITION(adobe::progress_bar_t); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DEFINITION(adobe::separator_t); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DEFINITION(adobe::static_text_t); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DEFINITION(adobe::edit_text_t); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DEFINITION(adobe::popup_t); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DEFINITION(adobe::unit_edit_text_t); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DEFINITION(adobe::slider_t); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DEFINITION(adobe::bevel_button_t); #ifndef NDEBUG ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DEFINITION(adobe::hitless_t); #endif // NDEBUG Index: client_assembler.cpp =================================================================== RCS file: /cvsroot/adobe-source/sandbox/visual_refactor/adobe/test/visual/sources/client_assembler.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** client_assembler.cpp 18 Apr 2005 21:16:05 -0000 1.1 --- client_assembler.cpp 19 Apr 2005 17:55:57 -0000 1.2 *************** *** 287,292 **** std::string name_m; std::string tooltip_m; ! adobe::name_t identifier_m; ! adobe::name_t class_m; adobe::eve_t::iterator eve_token_m; --- 287,292 ---- std::string name_m; std::string tooltip_m; ! adobe::name_t identifier_m; ! adobe::name_t class_m; adobe::eve_t::iterator eve_token_m; *************** *** 294,301 **** // These items are used to bind the view to an adam sheet ! adobe::name_t bind_m; ! adobe::name_t bind_indirect_m; std::vector<adobe::name_t> touch_set_m; ! adobe::name_t focus_m; adobe::sheet_t* sheet_m; adobe::assemblage_t* assemblage_m; --- 294,301 ---- // These items are used to bind the view to an adam sheet ! adobe::name_t bind_m; ! adobe::name_t bind_indirect_m; std::vector<adobe::name_t> touch_set_m; ! adobe::name_t focus_m; adobe::sheet_t* sheet_m; adobe::assemblage_t* assemblage_m; *************** *** 309,313 **** /****************************************************************************************************/ ! struct dialog_proxy_t : client_proxy_t, adobe::rectangle_slices_t { explicit dialog_proxy_t(const adobe::dictionary_t& parameters, mac_token_t&, client_proxy_t*); --- 309,313 ---- /****************************************************************************************************/ ! struct dialog_proxy_t : client_proxy_t, adobe::extents_slices_t { explicit dialog_proxy_t(const adobe::dictionary_t& parameters, mac_token_t&, client_proxy_t*); *************** *** 330,334 **** /****************************************************************************************************/ ! struct palette_proxy_t : client_proxy_t, adobe::rectangle_slices_t { explicit palette_proxy_t(const adobe::dictionary_t& parameters, mac_token_t&, client_proxy_t*); --- 330,334 ---- /****************************************************************************************************/ ! struct palette_proxy_t : client_proxy_t, adobe::extents_slices_t { explicit palette_proxy_t(const adobe::dictionary_t& parameters, mac_token_t&, client_proxy_t*); *************** *** 346,350 **** /****************************************************************************************************/ ! struct group_proxy_t : client_proxy_t, adobe::rectangle_slices_t { explicit group_proxy_t(const adobe::dictionary_t& parameters, mac_token_t&, client_proxy_t*); --- 346,350 ---- /****************************************************************************************************/ ! struct group_proxy_t : client_proxy_t, adobe::extents_slices_t { explicit group_proxy_t(const adobe::dictionary_t& parameters, mac_token_t&, client_proxy_t*); *************** *** 366,370 **** /****************************************************************************************************/ ! struct tab_group_proxy_t : client_proxy_t, adobe::rectangle_slices_t { explicit tab_group_proxy_t(const adobe::dictionary_t& parameters, mac_token_t&, client_proxy_t*); --- 366,370 ---- /****************************************************************************************************/ ! struct tab_group_proxy_t : client_proxy_t, adobe::extents_slices_t { explicit tab_group_proxy_t(const adobe::dictionary_t& parameters, mac_token_t&, client_proxy_t*); *************** *** 389,393 **** /****************************************************************************************************/ ! struct panel_proxy_t : client_proxy_t, adobe::rectangle_slices_t { explicit panel_proxy_t(const adobe::dictionary_t& parameters, mac_token_t&, client_proxy_t*); --- 389,393 ---- /****************************************************************************************************/ ! struct panel_proxy_t : client_proxy_t, adobe::extents_slices_t { explicit panel_proxy_t(const adobe::dictionary_t& parameters, mac_token_t&, client_proxy_t*); *************** *** 408,412 **** /****************************************************************************************************/ ! struct separator_proxy_t : client_proxy_t, adobe::rectangle_slices_t { explicit separator_proxy_t(const adobe::dictionary_t& parameters, mac_token_t&, client_proxy_t*); --- 408,412 ---- /****************************************************************************************************/ ! struct separator_proxy_t : client_proxy_t, adobe::extents_slices_t { explicit separator_proxy_t(const adobe::dictionary_t& parameters, mac_token_t&, client_proxy_t*); *************** *** 482,486 **** /****************************************************************************************************/ ! struct button_proxy_t : client_proxy_t, adobe::rectangle_slices_t { explicit button_proxy_t(const adobe::dictionary_t& parameters, mac_token_t&, client_proxy_t*); --- 482,486 ---- /****************************************************************************************************/ ! struct button_proxy_t : client_proxy_t, adobe::extents_slices_t { explicit button_proxy_t(const adobe::dictionary_t& parameters, mac_token_t&, client_proxy_t*); *************** *** 522,526 **** /****************************************************************************************************/ ! struct popup_proxy_t : client_proxy_t, adobe::rectangle_slices_t { explicit popup_proxy_t(const adobe::dictionary_t& parameters, mac_token_t&, client_proxy_t*); --- 522,526 ---- /****************************************************************************************************/ ! struct popup_proxy_t : client_proxy_t, adobe::extents_slices_t { explicit popup_proxy_t(const adobe::dictionary_t& parameters, mac_token_t&, client_proxy_t*); *************** *** 541,545 **** /****************************************************************************************************/ ! struct link_proxy_t : client_proxy_t, adobe::rectangle_slices_t { explicit link_proxy_t(const adobe::dictionary_t& parameters, mac_token_t&, client_proxy_t*); --- 541,545 ---- /****************************************************************************************************/ ! struct link_proxy_t : client_proxy_t, adobe::extents_slices_t { explicit link_proxy_t(const adobe::dictionary_t& parameters, mac_token_t&, client_proxy_t*); *************** *** 564,568 **** /****************************************************************************************************/ ! struct checkbox_proxy_t : client_proxy_t, adobe::rectangle_slices_t { explicit checkbox_proxy_t(const adobe::dictionary_t& parameters, mac_token_t&, client_proxy_t*); --- 564,568 ---- /****************************************************************************************************/ ! struct checkbox_proxy_t : client_proxy_t, adobe::extents_slices_t { explicit checkbox_proxy_t(const adobe::dictionary_t& parameters, mac_token_t&, client_proxy_t*); *************** *** 572,580 **** private: ! void value_changed(adobe::modifiers_t, std::size_t new_value); void monitor_value(const adobe::value_t&); ! ! std::size_t last_m; // debounce adobe::checkbox_t control_m; }; --- 572,580 ---- private: ! void value_changed(adobe::value_t new_value); void monitor_value(const adobe::value_t&); ! ! adobe::value_t last_m; adobe::checkbox_t control_m; }; *************** *** 582,586 **** /****************************************************************************************************/ ! struct radio_button_proxy_t : client_proxy_t, adobe::rectangle_slices_t { explicit radio_button_proxy_t(const adobe::dictionary_t& parameters, mac_token_t&, client_proxy_t*); --- 582,586 ---- /****************************************************************************************************/ ! struct radio_button_proxy_t : client_proxy_t, adobe::extents_slices_t { explicit radio_button_proxy_t(const adobe::dictionary_t& parameters, mac_token_t&, client_proxy_t*); *************** *** 610,614 **** template <bevel_emulation_t emulation> ! struct bevel_button_proxy_t : client_proxy_t, adobe::rectangle_slices_t { explicit bevel_button_proxy_t(const adobe::dictionary_t& parameters, mac_token_t&, client_proxy_t*); --- 610,614 ---- template <bevel_emulation_t emulation> ! struct bevel_button_proxy_t : client_proxy_t, adobe::extents_slices_t { explicit bevel_button_proxy_t(const adobe::dictionary_t& parameters, mac_token_t&, client_proxy_t*); *************** *** 647,651 **** /****************************************************************************************************/ ! struct progress_bar_proxy_t : client_proxy_t, adobe::rectangle_slices_t { explicit progress_bar_proxy_t(const adobe::dictionary_t& parameters, mac_token_t&, client_proxy_t*); --- 647,651 ---- /****************************************************************************************************/ ! struct progress_bar_proxy_t : client_proxy_t, adobe::extents_slices_t { explicit progress_bar_proxy_t(const adobe::dictionary_t& parameters, mac_token_t&, client_proxy_t*); *************** *** 665,669 **** /****************************************************************************************************/ ! struct static_text_proxy_t : client_proxy_t, adobe::rectangle_slices_t { explicit static_text_proxy_t(const adobe::dictionary_t& parameters, mac_token_t&, client_proxy_t*); --- 665,669 ---- /****************************************************************************************************/ ! struct static_text_proxy_t : client_proxy_t, adobe::extents_slices_t { explicit static_text_proxy_t(const adobe::dictionary_t& parameters, mac_token_t&, client_proxy_t*); *************** *** 680,684 **** /****************************************************************************************************/ ! struct edit_number_proxy_t : client_proxy_t, adobe::rectangle_slices_t { explicit edit_number_proxy_t(const adobe::dictionary_t& parameters, mac_token_t&, client_proxy_t*); --- 680,684 ---- /****************************************************************************************************/ ! struct edit_number_proxy_t : client_proxy_t, adobe::extents_slices_t { explicit edit_number_proxy_t(const adobe::dictionary_t& parameters, mac_token_t&, client_proxy_t*); *************** *** 739,743 **** /****************************************************************************************************/ ! struct slider_proxy_t : client_proxy_t, adobe::rectangle_slices_t { explicit slider_proxy_t(const adobe::dictionary_t& parameters, mac_token_t&, client_proxy_t*); --- 739,743 ---- /****************************************************************************************************/ ! struct slider_proxy_t : client_proxy_t, adobe::extents_slices_t { explicit slider_proxy_t(const adobe::dictionary_t& parameters, mac_token_t&, client_proxy_t*); *************** *** 761,765 **** /****************************************************************************************************/ ! struct edit_text_proxy_t : client_proxy_t, adobe::rectangle_slices_t { explicit edit_text_proxy_t(const adobe::dictionary_t& parameters, mac_token_t&, client_proxy_t*); --- 761,765 ---- /****************************************************************************************************/ ! struct edit_text_proxy_t : client_proxy_t, adobe::extents_slices_t { explicit edit_text_proxy_t(const adobe::dictionary_t& parameters, mac_token_t&, client_proxy_t*); *************** *** 792,795 **** --- 792,806 ---- /****************************************************************************************************/ + adobe::theme_t size_to_theme(size_enum_t size) + { + adobe::theme_t theme = adobe::theme_normal_s; + if (size == size_small_s) theme = adobe::theme_small_s; + else if (size == size_mini_s) theme = adobe::theme_mini_s; + + return theme; + } + + /****************************************************************************************************/ + #if defined(ADOBE_SERIALIZATION) template <typename Widget> *************** *** 807,815 **** local.size_m = parent.size_m; ! adobe::theme_t control_theme = adobe::theme_normal_s; ! if (local.size_m == size_small_s) control_theme = adobe::theme_small_s; ! else if (local.size_m == size_mini_s) control_theme = adobe::theme_mini_s; ! ! adobe::ui_core_interface::adorn_theme(control, control_theme); local.display_token_m = adobe::insert(adobe::get_main_display(), parent.display_token_m, control); --- 818,822 ---- local.size_m = parent.size_m; ! adobe::ui_core_interface::adorn_theme(control, size_to_theme(local.size_m)); local.display_token_m = adobe::insert(adobe::get_main_display(), parent.display_token_m, control); *************** *** 852,856 **** /****************************************************************************************************/ ! typedef std::pair<adobe::point_t, adobe::rectangle_t> place_converter_result_t; /****************************************************************************************************/ --- 859,863 ---- /****************************************************************************************************/ ! typedef std::pair<adobe::point_2d_t, adobe::extents_t> place_converter_result_t; /****************************************************************************************************/ *************** *** 860,872 **** /****************************************************************************************************/ ! void place_data_convert_slice(const adobe::eve_t::place_data_t& data, place_converter_result_t& result, adobe::rectangle_slices_t::slice_select_t slice) { ! const adobe::eve_t::place_data_t::slice_t& src_slice(data.slice_m[slice]); ! adobe::rectangle_t::slice_t& dst_slice(result.second.slice_m[slice]); ! if (slice == adobe::rectangle_slices_t::horizontal) ! result.first.first = src_slice.position_m; else ! result.first.second = src_slice.position_m; dst_slice.length_m = src_slice.length_m; --- 867,879 ---- /****************************************************************************************************/ ! void place_data_convert_slice(const adobe::eve_t::place_data_t& data, place_converter_result_t& result, adobe::extents_slices_t::slice_select_t slice) { ! const adobe::eve_t::place_data_t::slice_t& src_slice(data.slice_m[slice]); ! adobe::extents_t::slice_t& dst_slice(result.second.slice_m[slice]); ! if (slice == adobe::extents_slices_t::horizontal) ! result.first.x_m = src_slice.position_m; else ! result.first.y_m = src_slice.position_m; dst_slice.length_m = src_slice.length_m; *************** *** 874,885 **** dst_slice.outset_m = src_slice.outset_m; ! adobe::copy(src_slice.guides_m, std::back_inserter(dst_slice.poi_m)); } /****************************************************************************************************/ ! void best_bounds_data_convert_slice(const adobe::rectangle_t& ideal, adobe::eve_t::calculate_data_t& result, adobe::rectangle_slices_t::slice_select_t slice) { ! const adobe::rectangle_t::slice_t& src_slice(ideal.slice_m[slice]); adobe::eve_t::calculate_data_t::slice_t& dst_slice(result.slice_m[slice]); --- 881,892 ---- dst_slice.outset_m = src_slice.outset_m; ! adobe::copy(src_slice.guide_set_m, std::back_inserter(dst_slice.poi_m)); } /****************************************************************************************************/ ! void best_bounds_data_convert_slice(const adobe::extents_t& ideal, adobe::eve_t::calculate_data_t& result, adobe::extents_slices_t::slice_select_t slice) { ! const adobe::extents_t::slice_t& src_slice(ideal.slice_m[slice]); adobe::eve_t::calculate_data_t::slice_t& dst_slice(result.slice_m[slice]); *************** *** 889,893 **** dst_slice.frame_m = src_slice.frame_m; ! adobe::copy(src_slice.poi_m, std::back_inserter(dst_slice.guides_m)); } --- 896,900 ---- dst_slice.frame_m = src_slice.frame_m; ! adobe::copy(src_slice.poi_m, std::back_inserter(dst_slice.guide_set_m)); } *************** *** 902,907 **** place_converter_result_t result; ! implementation::place_data_convert_slice(data, result, adobe::rectangle_slices_t::horizontal); ! implementation::place_data_convert_slice(data, result, adobe::rectangle_slices_t::vertical); return result; --- 909,914 ---- place_converter_result_t result; ! implementation::place_data_convert_slice(data, result, adobe::extents_slices_t::horizontal); ! implementation::place_data_convert_slice(data, result, adobe::extents_slices_t::vertical); return result; *************** *** 910,917 **** /****************************************************************************************************/ ! adobe::eve_t::calculate_data_t best_bounds_data_converter(const adobe::rectangle_t& ideal, adobe::eve_t::calculate_data_t& result) { ! implementation::best_bounds_data_convert_slice(ideal, result, adobe::rectangle_slices_t::horizontal); ! implementation::best_bounds_data_convert_slice(ideal, result, adobe::rectangle_slices_t::vertical); return result; --- 917,924 ---- /****************************************************************************************************/ ! adobe::eve_t::calculate_data_t measure_extents_converter(const adobe::extents_t& ideal, adobe::eve_t::calculate_data_t& result) { ! implementation::best_bounds_data_convert_slice(ideal, result, adobe::extents_slices_t::horizontal); ! implementation::best_bounds_data_convert_slice(ideal, result, adobe::extents_slices_t::vertical); return result; *************** *** 937,941 **** place_converter_result_t conv(place_data_converter(data)); ! adobe::frame_geometry(window_m, conv.first, conv.second); } --- 944,948 ---- place_converter_result_t conv(place_data_converter(data)); ! adobe::frame_extents(window_m, conv.first, conv.second); } *************** *** 959,963 **** */ ! struct column_proxy_t : client_proxy_t, adobe::rectangle_slices_t { explicit column_proxy_t(const adobe::dictionary_t& parameters, mac_token_t&, client_proxy_t* parent) : --- 966,970 ---- */ ! struct column_proxy_t : client_proxy_t, adobe::extents_slices_t { explicit column_proxy_t(const adobe::dictionary_t& parameters, mac_token_t&, client_proxy_t* parent) : *************** *** 987,991 **** } ! struct row_proxy_t : client_proxy_t, adobe::rectangle_slices_t { explicit row_proxy_t(const adobe::dictionary_t& parameters, mac_token_t&, client_proxy_t* parent) : --- 994,998 ---- } ! struct row_proxy_t : client_proxy_t, adobe::extents_slices_t { explicit row_proxy_t(const adobe::dictionary_t& parameters, mac_token_t&, client_proxy_t* parent) : *************** *** 1015,1019 **** } ! struct overlay_proxy_t : client_proxy_t, adobe::rectangle_slices_t { explicit overlay_proxy_t(const adobe::dictionary_t& parameters, mac_token_t&, client_proxy_t* parent) : --- 1022,1026 ---- } ! struct overlay_proxy_t : client_proxy_t, adobe::extents_slices_t { explicit overlay_proxy_t(const adobe::dictionary_t& parameters, mac_token_t&, client_proxy_t* parent) : *************** *** 1063,1068 **** /****************************************************************************************************/ ! template <class T, class U> ! void calculate(T& t, U& u) { t.calculate(u); --- 1070,1075 ---- /****************************************************************************************************/ ! template <class T> ! void calculate(T& t, adobe::eve_t::calculate_data_t& u) { t.calculate(u); *************** *** 1071,1095 **** /****************************************************************************************************/ ! template <> void calculate<row_proxy_t, adobe::eve_t::calculate_data_t>(row_proxy_t&, adobe::eve_t::calculate_data_t&) { } ! template <> void calculate<column_proxy_t, adobe::eve_t::calculate_data_t>(column_proxy_t&, adobe::eve_t::calculate_data_t&) { } ! template <> void calculate<overlay_proxy_t, adobe::eve_t::calculate_data_t>(overlay_proxy_t&, adobe::eve_t::calculate_data_t&) { } ! template <> void calculate<dialog_proxy_t, adobe::eve_t::calculate_data_t>(dialog_proxy_t&, adobe::eve_t::calculate_data_t&) { } ! template <> void calculate<palette_proxy_t, adobe::eve_t::calculate_data_t>(palette_proxy_t&, adobe::eve_t::calculate_data_t&) { } /****************************************************************************************************/ template <> ! void calculate<button_proxy_t, adobe::eve_t::calculate_data_t>(button_proxy_t& button, adobe::eve_t::calculate_data_t& geometry) { ! best_bounds_data_converter(button.button_m.best_bounds(), geometry); ! geometry.slice_m[adobe::rectangle_slices_t::horizontal].length_m = ! std::max<long>(button_width, geometry.slice_m[adobe::rectangle_slices_t::horizontal].length_m); } /****************************************************************************************************/ ! template <class T, class U, class V> ! void calculate_vertical(T&, U&, V&) { } --- 1078,1102 ---- /****************************************************************************************************/ ! template <> void calculate<row_proxy_t>(row_proxy_t&, adobe::eve_t::calculate_data_t&) { } ! template <> void calculate<column_proxy_t>(column_proxy_t&, adobe::eve_t::calculate_data_t&) { } ! template <> void calculate<overlay_proxy_t>(overlay_proxy_t&, adobe::eve_t::calculate_data_t&) { } ! template <> void calculate<dialog_proxy_t>(dialog_proxy_t&, adobe::eve_t::calculate_data_t&) { } ! template <> void calculate<palette_proxy_t>(palette_proxy_t&, adobe::eve_t::calculate_data_t&) { } /****************************************************************************************************/ template <> ! void calculate<button_proxy_t>(button_proxy_t& button, adobe::eve_t::calculate_data_t& geometry) { ! measure_extents_converter(button.button_m.best_bounds(), geometry); ! geometry.slice_m[adobe::extents_slices_t::horizontal].length_m = ! std::max<long>(button_width, geometry.slice_m[adobe::extents_slices_t::horizontal].length_m); } /****************************************************************************************************/ ! template <class T> ! void calculate_vertical(T&, adobe::eve_t::calculate_data_t&, const adobe::eve_t::place_data_t&) { } *************** *** 1097,1101 **** template <> ! void calculate_vertical<static_text_proxy_t, adobe::eve_t::calculate_data_t, const adobe::eve_t::place_data_t> (static_text_proxy_t& t, adobe::eve_t::calculate_data_t& u, const adobe::eve_t::place_data_t& v) { --- 1104,1108 ---- template <> ! void calculate_vertical<static_text_proxy_t> (static_text_proxy_t& t, adobe::eve_t::calculate_data_t& u, const adobe::eve_t::place_data_t& v) { *************** *** 1105,1110 **** /****************************************************************************************************/ ! template <class T, class U, class V> ! void place(T& t, U& u, V& v) { t.place(u, v); --- 1112,1117 ---- /****************************************************************************************************/ ! template <class T> ! void place(T& t, const adobe::eve_t::calculate_data_t& u, const adobe::eve_t::place_data_t& v) { t.place(u, v); *************** *** 1113,1119 **** /****************************************************************************************************/ ! template <> void place<row_proxy_t, const adobe::eve_t::calculate_data_t, const adobe::eve_t::place_data_t>(row_proxy_t&, const adobe::eve_t::calculate_data_t&, const adobe::eve_t::place_data_t&) { } ! template <> void place<column_proxy_t, const adobe::eve_t::calculate_data_t, const adobe::eve_t::place_data_t>(column_proxy_t&, const adobe::eve_t::calculate_data_t&, const adobe::eve_t::place_data_t&) { } ! template <> void place<overlay_proxy_t, const adobe::eve_t::calculate_data_t, const adobe::eve_t::place_data_t>(overlay_proxy_t&, const adobe::eve_t::calculate_data_t&, const adobe::eve_t::place_data_t&) { } /****************************************************************************************************/ --- 1120,1126 ---- /****************************************************************************************************/ ! template <> void place<row_proxy_t>(row_proxy_t&, const adobe::eve_t::calculate_data_t&, const adobe::eve_t::place_data_t&) { } ! template <> void place<column_proxy_t>(column_proxy_t&, const adobe::eve_t::calculate_data_t&, const adobe::eve_t::place_data_t&) { } ! template <> void place<overlay_proxy_t>(overlay_proxy_t&, const adobe::eve_t::calculate_data_t&, const adobe::eve_t::place_data_t&) { } /****************************************************************************************************/ *************** *** 1137,1140 **** --- 1144,1148 ---- template <> void adorn_theme<adobe::panel_t>(adobe::panel_t&, adobe::theme_t){ } template <> void adorn_theme<adobe::separator_t>(adobe::separator_t&, adobe::theme_t){ } + template <> void adorn_theme<adobe::checkbox_t>(adobe::checkbox_t&, adobe::theme_t){ } /****************************************************************************************************/ *************** *** 1389,1393 **** void bevel_button_proxy_t<emulation>::calculate(adobe::eve_t::calculate_data_t& geometry) { ! best_bounds_data_converter(control_m.best_bounds(), geometry); if (emul_popup && popup_bind_m && items_m.size()) --- 1397,1401 ---- void bevel_button_proxy_t<emulation>::calculate(adobe::eve_t::calculate_data_t& geometry) { ! measure_extents_converter(control_m.best_bounds(), geometry); if (emul_popup && popup_bind_m && items_m.size()) *************** *** 1472,1476 **** void progress_bar_proxy_t::calculate(adobe::eve_t::calculate_data_t& geometry) { ! best_bounds_data_converter(progress_bar_m.best_bounds(), geometry); } --- 1480,1484 ---- void progress_bar_proxy_t::calculate(adobe::eve_t::calculate_data_t& geometry) { ! measure_extents_converter(progress_bar_m.best_bounds(), geometry); } *************** *** 1511,1515 **** void static_text_proxy_t::calculate(adobe::eve_t::calculate_data_t& geometry) { ! adobe::rectangle_t ideal(static_m.best_bounds()); if (wrap_m) --- 1519,1523 ---- void static_text_proxy_t::calculate(adobe::eve_t::calculate_data_t& geometry) { ! adobe::extents_t ideal(static_m.best_bounds()); if (wrap_m) *************** *** 1523,1527 **** adobe::copy(ideal.slice_m[vertical].poi_m, ! std::back_inserter<adobe::points_of_interest_t>(geometry.slice_m[vertical].guides_m)); } } --- 1531,1535 ---- adobe::copy(ideal.slice_m[vertical].poi_m, ! std::back_inserter<adobe::guide_set_t>(geometry.slice_m[vertical].guide_set_m)); } } *************** *** 1662,1666 **** void edit_text_proxy_t::calculate(adobe::eve_t::calculate_data_t& geometry) { ! best_bounds_data_converter(control_m.best_bounds(), geometry); } --- 1670,1674 ---- void edit_text_proxy_t::calculate(adobe::eve_t::calculate_data_t& geometry) { ! measure_extents_converter(control_m.best_bounds(), geometry); } *************** *** 1766,1770 **** void slider_proxy_t::calculate(adobe::eve_t::calculate_data_t& geometry) { ! best_bounds_data_converter(control_m.best_bounds(), geometry); } --- 1774,1778 ---- void slider_proxy_t::calculate(adobe::eve_t::calculate_data_t& geometry) { ! measure_extents_converter(control_m.best_bounds(), geometry); } *************** *** 2067,2071 **** void edit_number_proxy_t::calculate(adobe::eve_t::calculate_data_t& geometry) { ! best_bounds_data_converter(control_m.best_bounds(), geometry); } --- 2075,2079 ---- void edit_number_proxy_t::calculate(adobe::eve_t::calculate_data_t& geometry) { ! measure_extents_converter(control_m.best_bounds(), geometry); } *************** *** 2126,2130 **** void group_proxy_t::calculate(adobe::eve_t::calculate_data_t& geometry) { ! best_bounds_data_converter(control_m.best_bounds(), geometry); } --- 2134,2138 ---- void group_proxy_t::calculate(adobe::eve_t::calculate_data_t& geometry) { ! measure_extents_converter(control_m.best_bounds(), geometry); } *************** *** 2254,2258 **** void tab_group_proxy_t::calculate(adobe::eve_t::calculate_data_t& geometry) { ! best_bounds_data_converter(control_m.best_bounds(), geometry); } --- 2262,2266 ---- void tab_group_proxy_t::calculate(adobe::eve_t::calculate_data_t& geometry) { ! measure_extents_converter(control_m.best_bounds(), geometry); } *************** *** 2580,2584 **** void popup_proxy_t::calculate(adobe::eve_t::calculate_data_t& geometry) { ! best_bounds_data_converter(control_m.best_bounds(), geometry); } --- 2588,2592 ---- void popup_proxy_t::calculate(adobe::eve_t::calculate_data_t& geometry) { ! measure_extents_converter(control_m.best_bounds(), geometry); } *************** *** 2652,2656 **** for (std::size_t i(0); i < count_m; ++i) ! geometry.slice_m[vertical].guides_m.push_back(2); } --- 2660,2664 ---- for (std::size_t i(0); i < count_m; ++i) ! geometry.slice_m[vertical].guide_set_m.push_back(2); } *************** *** 2720,2724 **** void radio_button_proxy_t::calculate(adobe::eve_t::calculate_data_t& geometry) { ! best_bounds_data_converter(control_m.best_bounds(), geometry); } --- 2728,2732 ---- void radio_button_proxy_t::calculate(adobe::eve_t::calculate_data_t& geometry) { ! measure_extents_converter(control_m.best_bounds(), geometry); } *************** *** 2744,2753 **** client_proxy_t* parent) : client_proxy_t(parameters), last_m(0) { sheet_m = &token.sheet_m; - control_m.initialize(name_m); - set_up_control(*this, control_m, *parent, token); --- 2752,2760 ---- client_proxy_t* parent) : client_proxy_t(parameters), + control_m(name_m, adobe::value_t(true), adobe::value_t(false), size_to_theme(parent->size_m)), last_m(0) { sheet_m = &token.sheet_m; set_up_control(*this, control_m, *parent, token); *************** *** 2757,2761 **** token.assemblage_m.hold_connection(sheet_m->monitor_active(bind_m, boost::bind(&adobe::checkbox_t::set_active, boost::ref(control_m), _1))); ! control_m.signal_hit(boost::bind(&checkbox_proxy_t::value_changed, boost::ref(*this), _1, _2)); } } --- 2764,2768 ---- token.assemblage_m.hold_connection(sheet_m->monitor_active(bind_m, boost::bind(&adobe::checkbox_t::set_active, boost::ref(control_m), _1))); ! control_m.signal_hit(boost::bind(&checkbox_proxy_t::value_changed, boost::ref(*this), _1)); } } *************** *** 2763,2773 **** /****************************************************************************************************/ ! void checkbox_proxy_t::value_changed(adobe::modifiers_t, std::size_t new_value) { if (new_value == last_m) return; last_m = new_value; touch(); ! sheet_m->set(bind_m, adobe::value_t(bool(last_m))); sheet_m->update(); } --- 2770,2782 ---- /****************************************************************************************************/ ! void checkbox_proxy_t::value_changed(adobe::value_t new_value) { if (new_value == last_m) return; last_m = new_value; + touch(); ! ! sheet_m->set(bind_m, new_value); sheet_m->update(); } *************** *** 2777,2781 **** void checkbox_proxy_t::monitor_value(const adobe::value_t& value) { ! last_m = value.get<bool>(); // should this be a tribool (or something that can represent it)? control_m.set_value(last_m); --- 2786,2790 ---- void checkbox_proxy_t::monitor_value(const adobe::value_t& value) { ! last_m = value; control_m.set_value(last_m); *************** *** 2786,2790 **** void checkbox_proxy_t::calculate(adobe::eve_t::calculate_data_t& geometry) { ! best_bounds_data_converter(control_m.best_bounds(), geometry); } --- 2795,2799 ---- void checkbox_proxy_t::calculate(adobe::eve_t::calculate_data_t& geometry) { ! measure_extents_converter(control_m.measure(), geometry); } *************** *** 2794,2798 **** { place_converter_result_t conv(place_data_converter(data)); ! control_m.set_bounds(conv.first, conv.second); } --- 2803,2809 ---- { place_converter_result_t conv(place_data_converter(data)); ! #if 0 ! adobe::point_2d_t size(conv.second.width(), conv.second.height()); ! #endif control_m.set_bounds(conv.first, conv.second); } *************** *** 2869,2873 **** #ifndef NDEBUG ! if (adobe::clear_geometry_frames(window_m)) layout_m->do_framing(); #endif --- 2880,2884 ---- #ifndef NDEBUG ! if (adobe::clear_extents_frames(window_m)) layout_m->do_framing(); #endif *************** *** 2884,2888 **** place_converter_result_t conv(place_data_converter(data)); ! window_m.set_bounds(adobe::point_t(), conv.second); window_m.reposition(adobe::window_reposition_center_s); } --- 2895,2899 ---- place_converter_result_t conv(place_data_converter(data)); ! window_m.set_bounds(adobe::point_2d_t(), conv.second); window_m.reposition(adobe::window_reposition_center_s); } *************** *** 2952,2956 **** place_converter_result_t conv(place_data_converter(data)); ! window_m.set_bounds(adobe::point_t(), conv.second); window_m.reposition(adobe::window_reposition_alert_s); --- 2963,2967 ---- place_converter_result_t conv(place_data_converter(data)); ! window_m.set_bounds(adobe::point_2d_t(), conv.second); window_m.reposition(adobe::window_reposition_alert_s); *************** *** 3091,3097 **** signals.eve_container_defaults_proc_m = optional_container_defaults<T>(); ! signals.eve_calculate_proc_m = boost::bind(&adobe::eve_interface::calculate<T, adobe::eve_t::calculate_data_t>, boost::ref(*new_proxy), _1); ! signals.eve_calculate_vertical_proc_m = boost::bind(&adobe::eve_interface::calculate_vertical<T, adobe::eve_t::calculate_data_t, const adobe::eve_t::place_data_t>, boost::ref(*new_proxy), _1, _2); ! signals.eve_place_proc_m = boost::bind(&adobe::eve_interface::place<T, const adobe::eve_t::calculate_data_t, const adobe::eve_t::place_data_t>, boost::ref(*new_proxy), _1, _2); new_proxy->eve_token_m = eve.add_view_element( parent_proxy ? parent_proxy->eve_token_m : adobe::eve_t::iterator(), --- 3102,3108 ---- signals.eve_container_defaults_proc_m = optional_container_defaults<T>(); ! signals.eve_calculate_proc_m = boost::bind(&adobe::eve_interface::calculate<T>, boost::ref(*new_proxy), _1); ! signals.eve_calculate_vertical_proc_m = boost::bind(&adobe::eve_interface::calculate_vertical<T>, boost::ref(*new_proxy), _1, _2); ! signals.eve_place_proc_m = boost::bind(&adobe::eve_interface::place<T>, boost::ref(*new_proxy), _1, _2); new_proxy->eve_token_m = eve.add_view_element( parent_proxy ? parent_proxy->eve_token_m : adobe::eve_t::iterator(), |
|
From: Foster B. <fos...@us...> - 2005-04-19 17:56:37
|
Update of /cvsroot/adobe-source/sandbox/visual_refactor/adobe/test/visual/headers/win In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32418/adobe/test/visual/headers/win Modified Files: ui_core_implementation.hpp Log Message: rectangle now extents; started work on the ui_core, client_assembler API cleanup Index: ui_core_implementation.hpp =================================================================== RCS file: /cvsroot/adobe-source/sandbox/visual_refactor/adobe/test/visual/headers/win/ui_core_implementation.hpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ui_core_implementation.hpp 18 Apr 2005 21:16:03 -0000 1.1 --- ui_core_implementation.hpp 19 Apr 2005 17:55:56 -0000 1.2 *************** *** 19,23 **** #include <adobe/future/memory.hpp> ! #include <adobe/rectangle.hpp> #include <adobe/dictionary_fwd.hpp> --- 19,23 ---- #include <adobe/future/memory.hpp> ! #include <adobe/extents.hpp> #include <adobe/dictionary_fwd.hpp> *************** *** 55,64 **** void initialize(window_t& window); ! void set_bounds(const point_t& position, const rectangle_t& geometry); private: ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_FRIEND_DECLARATION(adobe::hitless_t); ! friend void frame_geometry(window_t& window, const point_t& position, const rectangle_t& geometry); friend bool clear_geometry_frames(window_t& window); --- 55,64 ---- void initialize(window_t& window); ! void set_bounds(const point_t& position, const extents_t& geometry); private: ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_FRIEND_DECLARATION(adobe::hitless_t); ! friend void frame_geometry(window_t& window, const point_t& position, const extents_t& geometry); friend bool clear_geometry_frames(window_t& window); *************** *** 80,86 **** virtual ~control_t(); ! virtual rectangle_t best_bounds(); ! void set_bounds(const point_t& position, const rectangle_t& geometry); void set_name(const std::string& name); virtual void set_theme(theme_t theme); --- 80,86 ---- virtual ~control_t(); ! virtual extents_t best_bounds(); ! void set_bounds(const point_t& position, const extents_t& geometry); void set_name(const std::string& name); virtual void set_theme(theme_t theme); *************** *** 119,123 **** theme_t theme_m; implementation::control_focus_proc_t focus_proc_m; ! rectangle_t geometry_m; // saving set_bounds param for essentials point_t position_m; // saving set_bounds param for widget framing int uxtheme_type_m; --- 119,123 ---- theme_t theme_m; implementation::control_focus_proc_t focus_proc_m; ! extents_t geometry_m; // saving set_bounds param for essentials point_t position_m; // saving set_bounds param for widget framing int uxtheme_type_m; *************** *** 149,153 **** DWORD style); ! void set_bounds(const point_t& position, const rectangle_t& geometry); void reposition(window_reposition_t position); void set_visible(bool make_visible); --- 149,153 ---- DWORD style); ! void set_bounds(const point_t& position, const extents_t& geometry); void reposition(window_reposition_t position); void set_visible(bool make_visible); *************** *** 160,164 **** HWND window_m; ! rectangle_t geometry_m; // saving set_bounds param for essentials implementation::window_resize_complete_proc_t resize_complete_proc_m; #ifndef NDEBUG --- 160,164 ---- HWND window_m; ! extents_t geometry_m; // saving set_bounds param for essentials implementation::window_resize_complete_proc_t resize_complete_proc_m; #ifndef NDEBUG *************** *** 194,198 **** void initialize( const RECT& bounds, const std::string& name); ! virtual rectangle_t best_bounds(); ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_FRIEND_DECLARATION(adobe::group_t::implementation_t); --- 194,198 ---- void initialize( const RECT& bounds, const std::string& name); ! virtual extents_t best_bounds(); ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_FRIEND_DECLARATION(adobe::group_t::implementation_t); *************** *** 215,219 **** const tab_group_t::tab_t* last); virtual void set_theme(theme_t theme); ! virtual rectangle_t best_bounds(); void set_value(const value_t& new_value); void signal_value_change(const implementation::tab_group_value_proc_t& proc); --- 215,219 ---- const tab_group_t::tab_t* last); virtual void set_theme(theme_t theme); ! virtual extents_t best_bounds(); void set_value(const value_t& new_value); void signal_value_change(const implementation::tab_group_value_proc_t& proc); *************** *** 332,336 **** void initialize(const RECT& bounds); ! void set_bounds(const point_t& position, const rectangle_t& geometry); void set_value(bool value); void set_visible(bool make_visible); --- 332,336 ---- void initialize(const RECT& bounds); ! void set_bounds(const point_t& position, const extents_t& geometry); void set_value(bool value); void set_visible(bool make_visible); *************** *** 361,365 **** pb_style_t bar_style, bool is_vertical); ! virtual rectangle_t best_bounds(); void set_min_value(long min_value); void set_max_value(long max_value); --- 361,365 ---- pb_style_t bar_style, bool is_vertical); ! virtual extents_t best_bounds(); void set_min_value(long min_value); void set_max_value(long max_value); *************** *** 428,433 **** long rows); static_text_t& get_label(); ! virtual rectangle_t best_bounds(); ! void set_bounds(const point_t& position, const rectangle_t& geometry); void set_active(bool active); virtual void set_theme(theme_t theme); --- 428,433 ---- long rows); static_text_t& get_label(); ! virtual extents_t best_bounds(); ! void set_bounds(const point_t& position, const extents_t& geometry); void set_active(bool active); virtual void set_theme(theme_t theme); *************** *** 483,488 **** void initialize(const RECT& bounds, const std::string& name); static_text_t& get_label(); ! virtual rectangle_t best_bounds(); ! void set_bounds(const point_t& position, const rectangle_t& geometry); void set_active(bool active); virtual void set_theme(theme_t theme); --- 483,488 ---- void initialize(const RECT& bounds, const std::string& name); static_text_t& get_label(); ! virtual extents_t best_bounds(); ! void set_bounds(const point_t& position, const extents_t& geometry); void set_active(bool active); virtual void set_theme(theme_t theme); *************** *** 527,532 **** long rows); popup_t& get_popup(); ! virtual rectangle_t best_bounds(); ! void set_bounds(const point_t& position, const rectangle_t& geometry); void set_active(bool active); virtual void set_theme(theme_t theme); --- 527,532 ---- long rows); popup_t& get_popup(); ! virtual extents_t best_bounds(); ! void set_bounds(const point_t& position, const extents_t& geometry); void set_active(bool active); virtual void set_theme(theme_t theme); *************** *** 562,566 **** slider_style_t style, long num_tick_marks); ! virtual rectangle_t best_bounds(); void set_min_value(long min_value); void set_max_value(long max_value); --- 562,566 ---- slider_style_t style, long num_tick_marks); ! virtual extents_t best_bounds(); void set_min_value(long min_value); void set_max_value(long max_value); *************** *** 653,657 **** void initialize(const RECT& bounds, HWND window); ! void set_bounds(const point_t& position, const rectangle_t& geometry); void overlay_bounds_update(); --- 653,657 ---- void initialize(const RECT& bounds, HWND window); ! void set_bounds(const point_t& position, const extents_t& geometry); void overlay_bounds_update(); |
|
From: Foster B. <fos...@us...> - 2005-04-19 17:56:37
|
Update of /cvsroot/adobe-source/sandbox/visual_refactor/adobe/test/visual/resources In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32418/adobe/test/visual/resources Modified Files: metrics_glossary.xstr Log Message: rectangle now extents; started work on the ui_core, client_assembler API cleanup Index: metrics_glossary.xstr =================================================================== RCS file: /cvsroot/adobe-source/sandbox/visual_refactor/adobe/test/visual/resources/metrics_glossary.xstr,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** metrics_glossary.xstr 18 Apr 2005 21:16:04 -0000 1.1 --- metrics_glossary.xstr 19 Apr 2005 17:55:57 -0000 1.2 *************** *** 44,52 **** <xstr id='metric:edit_text' scroll='false'> ! { size: [ 3, 19 ], adjust_size: [ -2, -2 ], adjust_position: [ 7, 7 ], outset: [ 4, 4, 4, 4 ], adjust_baseline: 3 }</xstr> <xstr id='metric:edit_text' scroll='false' theme='small'> ! { size: [ 4, 16 ], adjust_size: [ -2, -2 ], adjust_position: [ 7, 7 ], outset: [ 4, 4, 4, 4 ], adjust_baseline: 3 }</xstr> <xstr id='metric:edit_text' scroll='false' theme='mini'> ! { size: [ 4, 13 ], adjust_size: [ -2, -2 ], adjust_position: [ 7, 7 ], outset: [ 4, 4, 4, 4 ], adjust_baseline: 3 }</xstr> <xstr id='metric:edit_text' scroll='true'> --- 44,52 ---- <xstr id='metric:edit_text' scroll='false'> ! { size: [ 3, 20 ], adjust_size: [ -2, -2 ], adjust_position: [ 7, 7 ], outset: [ 4, 4, 4, 4 ], adjust_baseline: 3 }</xstr> <xstr id='metric:edit_text' scroll='false' theme='small'> ! { size: [ 4, 17 ], adjust_size: [ -2, -2 ], adjust_position: [ 7, 7 ], outset: [ 4, 4, 4, 4 ], adjust_baseline: 3 }</xstr> <xstr id='metric:edit_text' scroll='false' theme='mini'> ! { size: [ 4, 15 ], adjust_size: [ -2, -2 ], adjust_position: [ 7, 7 ], outset: [ 4, 4, 4, 4 ], adjust_baseline: 3 }</xstr> <xstr id='metric:edit_text' scroll='true'> |
|
From: Foster B. <fos...@us...> - 2005-04-19 17:56:37
|
Update of /cvsroot/adobe-source/sandbox/visual_refactor/adobe/test/visual/headers In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32418/adobe/test/visual/headers Modified Files: client_assembler.hpp ui_core.hpp ui_core_common.hpp Log Message: rectangle now extents; started work on the ui_core, client_assembler API cleanup Index: ui_core_common.hpp =================================================================== RCS file: /cvsroot/adobe-source/sandbox/visual_refactor/adobe/test/visual/headers/ui_core_common.hpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ui_core_common.hpp 18 Apr 2005 21:16:03 -0000 1.1 --- ui_core_common.hpp 19 Apr 2005 17:55:56 -0000 1.2 *************** *** 12,16 **** /****************************************************************************************************/ ! #include <adobe/rectangle.hpp> /****************************************************************************************************/ --- 12,16 ---- /****************************************************************************************************/ ! #include <adobe/extents.hpp> /****************************************************************************************************/ *************** *** 35,39 **** // ! void align_slices(::adobe::rectangle_t::slice_t& slice_one, ::adobe::rectangle_t::slice_t slice_two); /****************************************************************************************************/ --- 35,39 ---- // ! void align_slices(::adobe::extents_t::slice_t& slice_one, ::adobe::extents_t::slice_t slice_two); /****************************************************************************************************/ Index: client_assembler.hpp =================================================================== RCS file: /cvsroot/adobe-source/sandbox/visual_refactor/adobe/test/visual/headers/client_assembler.hpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** client_assembler.hpp 18 Apr 2005 21:16:03 -0000 1.1 --- client_assembler.hpp 19 Apr 2005 17:55:55 -0000 1.2 *************** *** 116,120 **** #ifndef NDEBUG ! void clear_frames() { if (window_m) adobe::clear_geometry_frames(*window_m); } #endif --- 116,120 ---- #ifndef NDEBUG ! void clear_frames() { if (window_m) adobe::clear_extents_frames(*window_m); } #endif Index: ui_core.hpp =================================================================== RCS file: /cvsroot/adobe-source/sandbox/visual_refactor/adobe/test/visual/headers/ui_core.hpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ui_core.hpp 18 Apr 2005 21:16:03 -0000 1.1 --- ui_core.hpp 19 Apr 2005 17:55:56 -0000 1.2 *************** *** 23,27 **** #include <adobe/value.hpp> #include <adobe/dictionary.hpp> ! #include <adobe/rectangle.hpp> /****************************************************************************************************/ --- 23,36 ---- #include <adobe/value.hpp> #include <adobe/dictionary.hpp> ! #include <adobe/extents.hpp> ! ! /****************************************************************************************************/ ! ! /*! ! \defgroup ui_core UI Core Widget API ! \ingroup widget_lib ! ! This collection documentes the UI core widget element set. ! */ /****************************************************************************************************/ *************** *** 64,86 **** #if defined(ADOBE_SERIALIZATION) ! #define ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DECLARATION(type) \ bool operator == (const type& x, const type& y); \ - bool operator < (const type& x, const type& y); \ std::ostream& operator << (std::ostream& s, const type& x) ! #define ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_FRIEND_DECLARATION(type) \ friend bool operator == (const type& x, const type& y); \ - friend bool operator < (const type& x, const type& y); \ friend std::ostream& operator << (std::ostream& s, const type& x) #else ! #define ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DECLARATION(type) \ ! bool operator == (const type& x, const type& y); \ ! bool operator < (const type& x, const type& y) ! #define ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_FRIEND_DECLARATION(type) \ ! friend bool operator == (const type& x, const type& y); \ ! friend bool operator < (const type& x, const type& y) #endif --- 73,91 ---- #if defined(ADOBE_SERIALIZATION) ! #define ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DECLARATION(type) \ bool operator == (const type& x, const type& y); \ std::ostream& operator << (std::ostream& s, const type& x) ! #define ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(type) \ friend bool operator == (const type& x, const type& y); \ friend std::ostream& operator << (std::ostream& s, const type& x) #else ! #define ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DECLARATION(type) \ ! bool operator == (const type& x, const type& y); ! #define ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(type) \ ! friend bool operator == (const type& x, const type& y); #endif *************** *** 139,167 **** }; enum theme_t { theme_none_s = 0, ! // Theme bases. Mutually exclusive. ! theme_large_s = 1, // for dialogs & windows (atypical) ! theme_normal_s = 2, // for dialogs & windows ! theme_small_s = 3, // for palettes ! theme_mini_s = 4, // for palettes (atypical) ! // Theme adornments. Can be set with any of the above. ! theme_adornment_label_s = 1L << 29, // displaying a label ! theme_adornment_number_s = 1L << 30, // displaying a number ! theme_adornment_mono_s = 1L << 31, // monospacing ! // Masks theme_mask_s = theme_large_s | theme_normal_s | theme_small_s | theme_mini_s, theme_adornment_mask_s = theme_adornment_mono_s | theme_adornment_number_s | theme_adornment_label_s, ! // Default theme theme_default_s = theme_normal_s }; --- 144,191 ---- }; + /*! + \ingroup ui_core + + \brief Semantic theme settings to apply to a widget + + \note + The theme sizes (<code>theme_large_s</code> through <code>theme_mini_s</code>)\ + are mutually exclusive. A theme's adornments can be manipulated via logical + operations. + */ + enum theme_t { + /// No theme theme_none_s = 0, ! /// For dialogs & windows (atypical) ! theme_large_s = 1, ! /// For dialogs & windows ! theme_normal_s = 2, ! /// For palettes ! theme_small_s = 3, ! /// For palettes (atypical) ! theme_mini_s = 4, ! /// Adornment for displaying a label ! theme_adornment_label_s = 1L << 29, ! /// Adornment for displaying a number ! theme_adornment_number_s = 1L << 30, ! /// Adornment for monospacing widget text ! theme_adornment_mono_s = 1L << 31, ! /// Theme mask to obtain widget size theme_mask_s = theme_large_s | theme_normal_s | theme_small_s | theme_mini_s, + + /// Theme mask to obtain widget adornments theme_adornment_mask_s = theme_adornment_mono_s | theme_adornment_number_s | theme_adornment_label_s, ! /// Default theme theme_default_s = theme_normal_s }; *************** *** 211,215 **** typedef boost::function<void (adobe::modifiers_t, std::size_t)> radio_button_hit_proc_t; ! typedef boost::function<void (adobe::modifiers_t, std::size_t)> checkbox_hit_proc_t; typedef control_hit_proc_t link_hit_proc_t; --- 235,239 ---- typedef boost::function<void (adobe::modifiers_t, std::size_t)> radio_button_hit_proc_t; ! typedef boost::function<void (adobe::value_t)> checkbox_hit_proc_t; typedef control_hit_proc_t link_hit_proc_t; *************** *** 295,299 **** /****************************************************************************************************/ ! struct window_t : boost::totally_ordered<window_t> { window_t(); --- 319,323 ---- /****************************************************************************************************/ ! struct window_t : boost::equality_comparable<window_t> { window_t(); *************** *** 307,311 **** window_modality_t modality); ! void set_bounds(const point_t& position, const rectangle_t& geometry); void reposition(window_reposition_t position); --- 331,335 ---- window_modality_t modality); ! void set_bounds(const point_2d_t& position, const extents_t& geometry); void reposition(window_reposition_t position); *************** *** 318,322 **** private: ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_FRIEND_DECLARATION(adobe::window_t); ADOBE_UI_CORE_IMPLEMENTATION_SWAP_FRIEND_DECLARATION(window_t); --- 342,346 ---- private: ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::window_t); ADOBE_UI_CORE_IMPLEMENTATION_SWAP_FRIEND_DECLARATION(window_t); *************** *** 340,344 **** /****************************************************************************************************/ ! struct group_t : boost::totally_ordered<group_t> { struct implementation_t; --- 364,368 ---- /****************************************************************************************************/ ! struct group_t : boost::equality_comparable<group_t> { struct implementation_t; *************** *** 351,356 **** void initialize(const std::string& name); ! rectangle_t best_bounds(); ! void set_bounds(const point_t& position, const rectangle_t& geometry); void set_name(const std::string& name); --- 375,380 ---- 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); *************** *** 364,368 **** private: ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_FRIEND_DECLARATION(adobe::group_t); ADOBE_UI_CORE_IMPLEMENTATION_SWAP_FRIEND_DECLARATION(group_t); --- 388,392 ---- private: ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::group_t); ADOBE_UI_CORE_IMPLEMENTATION_SWAP_FRIEND_DECLARATION(group_t); *************** *** 376,380 **** /****************************************************************************************************/ ! struct tab_group_t : boost::totally_ordered<tab_group_t> { struct implementation_t; --- 400,404 ---- /****************************************************************************************************/ ! struct tab_group_t : boost::equality_comparable<tab_group_t> { struct implementation_t; *************** *** 393,398 **** void initialize(tab_t* first, tab_t* last); ! rectangle_t best_bounds(); ! void set_bounds(const point_t& position, const rectangle_t& geometry); void set_theme(theme_t theme); --- 417,422 ---- void initialize(tab_t* first, tab_t* last); ! extents_t best_bounds(); ! void set_bounds(const point_2d_t& position, const extents_t& geometry); void set_theme(theme_t theme); *************** *** 408,412 **** private: ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_FRIEND_DECLARATION(adobe::tab_group_t); ADOBE_UI_CORE_IMPLEMENTATION_SWAP_FRIEND_DECLARATION(tab_group_t); --- 432,436 ---- private: ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::tab_group_t); ADOBE_UI_CORE_IMPLEMENTATION_SWAP_FRIEND_DECLARATION(tab_group_t); *************** *** 420,424 **** /****************************************************************************************************/ ! struct panel_t : boost::totally_ordered<panel_t> { struct implementation_t; --- 444,448 ---- /****************************************************************************************************/ ! struct panel_t : boost::equality_comparable<panel_t> { struct implementation_t; *************** *** 431,436 **** void initialize(); ! rectangle_t best_bounds() { return rectangle_t(); } ! void set_bounds(const point_t& position, const rectangle_t& geometry); void set_active(bool make_active); --- 455,460 ---- void initialize(); ! extents_t best_bounds() { return extents_t(); } ! void set_bounds(const point_2d_t& position, const extents_t& geometry); void set_active(bool make_active); *************** *** 438,442 **** private: ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_FRIEND_DECLARATION(adobe::panel_t); ADOBE_UI_CORE_IMPLEMENTATION_SWAP_FRIEND_DECLARATION(panel_t); --- 462,466 ---- private: ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::panel_t); ADOBE_UI_CORE_IMPLEMENTATION_SWAP_FRIEND_DECLARATION(panel_t); *************** *** 450,460 **** /****************************************************************************************************/ ! /* ! REVISIT (sparent) : Comments on button_t ! nuke initialize - prefer construction. Use boost::optional to defer construction if needed. */ ! struct button_t : boost::totally_ordered<button_t> { struct implementation_t; --- 474,484 ---- /****************************************************************************************************/ ! /*! ! \ingroup ui_core ! \todo (sparent) : nuke initialize - prefer construction. Use boost::optional to defer construction if needed. */ ! struct button_t : boost::equality_comparable<button_t> { struct implementation_t; *************** *** 480,485 **** void initialize(state_descriptor_t* first, state_descriptor_t* last); ! rectangle_t best_bounds(); ! void set_bounds(const point_t& position, const rectangle_t& geometry); void set_name(const std::string& name); --- 504,509 ---- void initialize(state_descriptor_t* first, state_descriptor_t* last); ! extents_t best_bounds(); ! void set_bounds(const point_2d_t& position, const extents_t& geometry); void set_name(const std::string& name); *************** *** 503,507 **** private: ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_FRIEND_DECLARATION(adobe::button_t); ADOBE_UI_CORE_IMPLEMENTATION_SWAP_FRIEND_DECLARATION(button_t); --- 527,531 ---- private: ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::button_t); ADOBE_UI_CORE_IMPLEMENTATION_SWAP_FRIEND_DECLARATION(button_t); *************** *** 515,519 **** /****************************************************************************************************/ ! struct radio_button_t : boost::totally_ordered<radio_button_t> { struct implementation_t; --- 539,543 ---- /****************************************************************************************************/ ! struct radio_button_t : boost::equality_comparable<radio_button_t> { struct implementation_t; *************** *** 526,531 **** void initialize(const std::string& name); ! rectangle_t best_bounds(); ! void set_bounds(const point_t& position, const rectangle_t& geometry); void set_name(const std::string& name); --- 550,555 ---- 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); *************** *** 545,549 **** private: ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_FRIEND_DECLARATION(adobe::radio_button_t); ADOBE_UI_CORE_IMPLEMENTATION_SWAP_FRIEND_DECLARATION(radio_button_t); --- 569,573 ---- private: ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::radio_button_t); ADOBE_UI_CORE_IMPLEMENTATION_SWAP_FRIEND_DECLARATION(radio_button_t); *************** *** 557,591 **** /****************************************************************************************************/ ! struct checkbox_t : boost::totally_ordered<checkbox_t> { struct implementation_t; ! checkbox_t(); ! checkbox_t(const checkbox_t& rhs); ! ~checkbox_t(); ! void initialize(const std::string& name); ! rectangle_t best_bounds(); ! void set_bounds(const point_t& position, const rectangle_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); ! void set_focused(bool make_focused); ! void set_value(bool value); - void signal_focus(implementation::control_focus_proc_t proc); void signal_hit(adobe::implementation::checkbox_hit_proc_t proc); private: ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_FRIEND_DECLARATION(adobe::checkbox_t); ADOBE_UI_CORE_IMPLEMENTATION_SWAP_FRIEND_DECLARATION(checkbox_t); --- 581,625 ---- /****************************************************************************************************/ ! /*! ! \ingroup ui_core ! ! \brief UI core checkbox widget ! */ ! ! struct checkbox_t : boost::equality_comparable<checkbox_t> { struct implementation_t; ! /*! ! \param name Name of the widget ! \param true_value Value to which the checkbox is set when it is checked ! \param false_value Value to which the checkbox is set when it is unchecked ! \param theme Theme for the widget ! \note ! If the checkbox is set to a value other than <code>true_value</code> or ! <code>false_value</code>, the checkbox gets a 'dash' (undefined) state. ! */ ! checkbox_t( const std::string& name, ! adobe::value_t true_value, ! adobe::value_t false_value, ! theme_t theme); ! checkbox_t(const checkbox_t& rhs); ! ~checkbox_t(); ! extents_t measure(); ! void set_bounds(const point_2d_t& position, const extents_t& extents); void set_active(bool make_active); ! void set_value(adobe::value_t value); void signal_hit(adobe::implementation::checkbox_hit_proc_t proc); private: ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::checkbox_t); ADOBE_UI_CORE_IMPLEMENTATION_SWAP_FRIEND_DECLARATION(checkbox_t); *************** *** 599,603 **** /****************************************************************************************************/ ! struct link_t : boost::totally_ordered<link_t> { struct implementation_t; --- 633,637 ---- /****************************************************************************************************/ ! struct link_t : boost::equality_comparable<link_t> { struct implementation_t; *************** *** 610,615 **** void initialize(); ! rectangle_t best_bounds(); ! void set_bounds(const point_t& position, const rectangle_t& geometry); void set_theme(theme_t theme); --- 644,649 ---- void initialize(); ! extents_t best_bounds(); ! void set_bounds(const point_2d_t& position, const extents_t& geometry); void set_theme(theme_t theme); *************** *** 624,628 **** private: ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_FRIEND_DECLARATION(adobe::link_t); ADOBE_UI_CORE_IMPLEMENTATION_SWAP_FRIEND_DECLARATION(link_t); --- 658,662 ---- private: ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::link_t); ADOBE_UI_CORE_IMPLEMENTATION_SWAP_FRIEND_DECLARATION(link_t); *************** *** 636,640 **** /****************************************************************************************************/ ! struct progress_bar_t : boost::totally_ordered<progress_bar_t> { struct implementation_t; --- 670,674 ---- /****************************************************************************************************/ ! struct progress_bar_t : boost::equality_comparable<progress_bar_t> { struct implementation_t; *************** *** 647,652 **** void initialize(pb_style_t bar_style, bool is_vertical); ! rectangle_t best_bounds(); ! void set_bounds(const point_t& position, const rectangle_t& geometry); void set_theme(theme_t theme); --- 681,686 ---- void initialize(pb_style_t bar_style, bool is_vertical); ! extents_t best_bounds(); ! void set_bounds(const point_2d_t& position, const extents_t& geometry); void set_theme(theme_t theme); *************** *** 664,668 **** private: ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_FRIEND_DECLARATION(adobe::progress_bar_t); ADOBE_UI_CORE_IMPLEMENTATION_SWAP_FRIEND_DECLARATION(progress_bar_t); --- 698,702 ---- private: ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::progress_bar_t); ADOBE_UI_CORE_IMPLEMENTATION_SWAP_FRIEND_DECLARATION(progress_bar_t); *************** *** 676,680 **** /****************************************************************************************************/ ! struct separator_t : boost::totally_ordered<separator_t> { struct implementation_t; --- 710,714 ---- /****************************************************************************************************/ ! struct separator_t : boost::equality_comparable<separator_t> { struct implementation_t; *************** *** 687,697 **** void initialize(); ! rectangle_t best_bounds(); ! void set_bounds(const point_t& position, const rectangle_t& geometry); void set_visible(bool make_visible); private: ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_FRIEND_DECLARATION(adobe::separator_t); ADOBE_UI_CORE_IMPLEMENTATION_SWAP_FRIEND_DECLARATION(separator_t); --- 721,731 ---- void initialize(); ! extents_t best_bounds(); ! void set_bounds(const point_2d_t& position, const extents_t& geometry); void set_visible(bool make_visible); private: ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::separator_t); ADOBE_UI_CORE_IMPLEMENTATION_SWAP_FRIEND_DECLARATION(separator_t); *************** *** 705,709 **** /****************************************************************************************************/ ! struct static_text_t : boost::totally_ordered<static_text_t> { struct implementation_t; --- 739,743 ---- /****************************************************************************************************/ ! struct static_text_t : boost::equality_comparable<static_text_t> { struct implementation_t; *************** *** 716,721 **** void initialize(const std::string& name); ! rectangle_t best_bounds(); ! void set_bounds(const point_t& position, const rectangle_t& geometry); void set_name(const std::string& name); --- 750,755 ---- 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); *************** *** 735,739 **** private: ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_FRIEND_DECLARATION(adobe::static_text_t); ADOBE_UI_CORE_IMPLEMENTATION_SWAP_FRIEND_DECLARATION(static_text_t); --- 769,773 ---- private: ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::static_text_t); ADOBE_UI_CORE_IMPLEMENTATION_SWAP_FRIEND_DECLARATION(static_text_t); *************** *** 747,751 **** /****************************************************************************************************/ ! struct edit_text_t : boost::totally_ordered<edit_text_t> { struct implementation_t; --- 781,785 ---- /****************************************************************************************************/ ! struct edit_text_t : boost::equality_comparable<edit_text_t> { struct implementation_t; *************** *** 761,766 **** long rows); ! rectangle_t best_bounds(); ! void set_bounds(const point_t& position, const rectangle_t& geometry); void set_name(const std::string& name); --- 795,800 ---- long rows); ! extents_t best_bounds(); ! void set_bounds(const point_2d_t& position, const extents_t& geometry); void set_name(const std::string& name); *************** *** 786,790 **** private: ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_FRIEND_DECLARATION(adobe::edit_text_t); ADOBE_UI_CORE_IMPLEMENTATION_SWAP_FRIEND_DECLARATION(edit_text_t); --- 820,824 ---- private: ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::edit_text_t); ADOBE_UI_CORE_IMPLEMENTATION_SWAP_FRIEND_DECLARATION(edit_text_t); *************** *** 798,802 **** /****************************************************************************************************/ ! struct popup_t : boost::totally_ordered<popup_t> { struct implementation_t; --- 832,836 ---- /****************************************************************************************************/ ! struct popup_t : boost::equality_comparable<popup_t> { struct implementation_t; *************** *** 809,814 **** void initialize(const std::string& name); ! rectangle_t best_bounds(); ! void set_bounds(const point_t& position, const rectangle_t& geometry); void set_name(const std::string& name); --- 843,848 ---- 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); *************** *** 836,840 **** private: ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_FRIEND_DECLARATION(adobe::popup_t); ADOBE_UI_CORE_IMPLEMENTATION_SWAP_FRIEND_DECLARATION(popup_t); --- 870,874 ---- private: ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::popup_t); ADOBE_UI_CORE_IMPLEMENTATION_SWAP_FRIEND_DECLARATION(popup_t); *************** *** 848,852 **** /****************************************************************************************************/ ! struct unit_edit_text_t : boost::totally_ordered<unit_edit_text_t> { struct implementation_t; --- 882,886 ---- /****************************************************************************************************/ ! struct unit_edit_text_t : boost::equality_comparable<unit_edit_text_t> { struct implementation_t; *************** *** 862,867 **** bool using_popup = true); ! rectangle_t best_bounds(); ! void set_bounds(const point_t& position, const rectangle_t& geometry); void set_name(const std::string& name); --- 896,901 ---- bool using_popup = true); ! extents_t best_bounds(); ! void set_bounds(const point_2d_t& position, const extents_t& geometry); void set_name(const std::string& name); *************** *** 891,895 **** private: ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_FRIEND_DECLARATION(adobe::unit_edit_text_t); ADOBE_UI_CORE_IMPLEMENTATION_SWAP_FRIEND_DECLARATION(unit_edit_text_t); --- 925,929 ---- private: ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::unit_edit_text_t); ADOBE_UI_CORE_IMPLEMENTATION_SWAP_FRIEND_DECLARATION(unit_edit_text_t); *************** *** 903,907 **** /****************************************************************************************************/ ! struct slider_t : boost::totally_ordered<slider_t> { struct implementation_t; --- 937,941 ---- /****************************************************************************************************/ ! struct slider_t : boost::equality_comparable<slider_t> { struct implementation_t; *************** *** 916,921 **** long num_tick_marks = 0); ! rectangle_t best_bounds(); ! void set_bounds(const point_t& position, const rectangle_t& geometry); void set_theme(theme_t theme); --- 950,955 ---- long num_tick_marks = 0); ! extents_t best_bounds(); ! void set_bounds(const point_2d_t& position, const extents_t& geometry); void set_theme(theme_t theme); *************** *** 936,940 **** private: ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_FRIEND_DECLARATION(adobe::slider_t); ADOBE_UI_CORE_IMPLEMENTATION_SWAP_FRIEND_DECLARATION(slider_t); --- 970,974 ---- private: ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::slider_t); ADOBE_UI_CORE_IMPLEMENTATION_SWAP_FRIEND_DECLARATION(slider_t); *************** *** 948,952 **** /****************************************************************************************************/ ! struct bevel_button_t : boost::totally_ordered<bevel_button_t> { struct implementation_t; --- 982,986 ---- /****************************************************************************************************/ ! struct bevel_button_t : boost::equality_comparable<bevel_button_t> { struct implementation_t; *************** *** 961,966 **** bool menu_points_right); ! rectangle_t best_bounds(); ! void set_bounds(const point_t& position, const rectangle_t& geometry); void set_name(const std::string& name); --- 995,1000 ---- bool menu_points_right); ! extents_t best_bounds(); ! void set_bounds(const point_2d_t& position, const extents_t& geometry); void set_name(const std::string& name); *************** *** 988,992 **** private: ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_FRIEND_DECLARATION(adobe::bevel_button_t); ADOBE_UI_CORE_IMPLEMENTATION_SWAP_FRIEND_DECLARATION(bevel_button_t); --- 1022,1026 ---- private: ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_FRIEND_DECLARATION(adobe::bevel_button_t); ADOBE_UI_CORE_IMPLEMENTATION_SWAP_FRIEND_DECLARATION(bevel_button_t); *************** *** 1001,1026 **** #ifndef NDEBUG ! void frame_geometry(window_t& window, const point_t& position, const rectangle_t& geometry); ! bool clear_geometry_frames(window_t& window); #endif // NDEBUG /****************************************************************************************************/ ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DECLARATION(adobe::window_t); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DECLARATION(adobe::group_t); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DECLARATION(adobe::tab_group_t); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DECLARATION(adobe::button_t); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DECLARATION(adobe::panel_t); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DECLARATION(adobe::radio_button_t); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DECLARATION(adobe::checkbox_t); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DECLARATION(adobe::link_t); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DECLARATION(adobe::progress_bar_t); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DECLARATION(adobe::separator_t); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DECLARATION(adobe::static_text_t); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DECLARATION(adobe::edit_text_t); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DECLARATION(adobe::popup_t); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DECLARATION(adobe::unit_edit_text_t); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DECLARATION(adobe::slider_t); ! ADOBE_SERIALIZABLE_TOTAL_ORDERING_BOILERPLATE_DECLARATION(adobe::bevel_button_t); /****************************************************************************************************/ --- 1035,1060 ---- #ifndef NDEBUG ! void frame_extents(window_t& window, const point_2d_t& position, const extents_t& geometry); ! bool clear_extents_frames(window_t& window); #endif // NDEBUG /****************************************************************************************************/ ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DECLARATION(adobe::window_t); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DECLARATION(adobe::group_t); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DECLARATION(adobe::tab_group_t); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DECLARATION(adobe::button_t); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DECLARATION(adobe::panel_t); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DECLARATION(adobe::radio_button_t); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DECLARATION(adobe::checkbox_t); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DECLARATION(adobe::link_t); ! 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); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DECLARATION(adobe::unit_edit_text_t); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DECLARATION(adobe::slider_t); ! ADOBE_SERIALIZABLE_EQUALITY_COMPARABLE_BOILERPLATE_DECLARATION(adobe::bevel_button_t); /****************************************************************************************************/ |
|
From: Foster B. <fos...@us...> - 2005-04-19 17:56:34
|
Update of /cvsroot/adobe-source/sandbox/visual_refactor/adobe/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32418/adobe/source Modified Files: eve.cpp Added Files: extents.cpp Removed Files: rectangle.cpp Log Message: rectangle now extents; started work on the ui_core, client_assembler API cleanup Index: eve.cpp =================================================================== RCS file: /cvsroot/adobe-source/sandbox/visual_refactor/adobe/source/eve.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** eve.cpp 18 Apr 2005 21:15:44 -0000 1.1 --- eve.cpp 19 Apr 2005 17:55:54 -0000 1.2 *************** *** 47,51 **** /*************************************************************************************************/ ! struct eve_t::view_proxy_t : rectangle_slices_t { view_proxy_t(const dictionary_t& parameters, const eve_t::signal_suite_t& signals); --- 47,51 ---- /*************************************************************************************************/ ! struct eve_t::view_proxy_t : extents_slices_t { view_proxy_t(const dictionary_t& parameters, const eve_t::signal_suite_t& signals); *************** *** 201,205 **** { (*alignment_table_g)( parameters.get<adobe::name_t>(key_horizontal), ! data.slice_m[adobe::rectangle_slices_t::horizontal].alignment_m); } --- 201,205 ---- { (*alignment_table_g)( parameters.get<adobe::name_t>(key_horizontal), ! data.slice_m[adobe::extents_slices_t::horizontal].alignment_m); } *************** *** 207,211 **** { (*alignment_table_g)( parameters.get<adobe::name_t>(key_vertical), ! data.slice_m[adobe::rectangle_slices_t::vertical].alignment_m); } --- 207,211 ---- { (*alignment_table_g)( parameters.get<adobe::name_t>(key_vertical), ! data.slice_m[adobe::extents_slices_t::vertical].alignment_m); } *************** *** 215,220 **** { // Turn on all guides - then selectively suppress ! data.slice_m[adobe::rectangle_slices_t::vertical].suppress_m = false; ! data.slice_m[adobe::rectangle_slices_t::horizontal].suppress_m = false; adobe::array_t guide_mask(parameters.get<adobe::array_t>(key_guide_mask)); --- 215,220 ---- { // Turn on all guides - then selectively suppress ! data.slice_m[adobe::extents_slices_t::vertical].suppress_m = false; ! data.slice_m[adobe::extents_slices_t::horizontal].suppress_m = false; adobe::array_t guide_mask(parameters.get<adobe::array_t>(key_guide_mask)); *************** *** 223,228 **** iter != last; ++iter) { ! if (iter->get<adobe::name_t>() == key_guide_baseline) data.slice_m[adobe::rectangle_slices_t::vertical].suppress_m = true; ! if (iter->get<adobe::name_t>() == key_guide_label) data.slice_m[adobe::rectangle_slices_t::horizontal].suppress_m = true; } } --- 223,228 ---- iter != last; ++iter) { ! if (iter->get<adobe::name_t>() == key_guide_baseline) data.slice_m[adobe::extents_slices_t::vertical].suppress_m = true; ! if (iter->get<adobe::name_t>() == key_guide_label) data.slice_m[adobe::extents_slices_t::horizontal].suppress_m = true; } } *************** *** 232,237 **** if (parameters.count(key_guide_balance)) // an empty array would allow baselines out. { ! data.slice_m[adobe::rectangle_slices_t::vertical].balance_m = false; ! data.slice_m[adobe::rectangle_slices_t::horizontal].balance_m = false; adobe::array_t guide_balance(parameters.get<adobe::array_t>(key_guide_balance)); --- 232,237 ---- if (parameters.count(key_guide_balance)) // an empty array would allow baselines out. { ! data.slice_m[adobe::extents_slices_t::vertical].balance_m = false; ! data.slice_m[adobe::extents_slices_t::horizontal].balance_m = false; adobe::array_t guide_balance(parameters.get<adobe::array_t>(key_guide_balance)); *************** *** 240,245 **** iter != last; ++iter) { ! if (iter->get<adobe::name_t>() == key_guide_baseline) data.slice_m[adobe::rectangle_slices_t::vertical].balance_m = true; ! if (iter->get<adobe::name_t>() == key_guide_label) data.slice_m[adobe::rectangle_slices_t::horizontal].balance_m = true; } } --- 240,245 ---- iter != last; ++iter) { ! if (iter->get<adobe::name_t>() == key_guide_baseline) data.slice_m[adobe::extents_slices_t::vertical].balance_m = true; ! if (iter->get<adobe::name_t>() == key_guide_label) data.slice_m[adobe::extents_slices_t::horizontal].balance_m = true; } } *************** *** 262,266 **** if (iter != parameters.end() && data.placement_m == adobe::eve_t::place_row && !parameters.count(key_guide_mask)) { ! data.slice_m[adobe::rectangle_slices_t::vertical].suppress_m = false; } --- 262,266 ---- if (iter != parameters.end() && data.placement_m == adobe::eve_t::place_row && !parameters.count(key_guide_mask)) { ! data.slice_m[adobe::extents_slices_t::vertical].suppress_m = false; } *************** *** 273,277 **** { (*alignment_table_g)( iter->second.get<adobe::name_t>(), ! data.slice_m[adobe::rectangle_slices_t::horizontal].child_alignment_m); } } --- 273,277 ---- { (*alignment_table_g)( iter->second.get<adobe::name_t>(), ! data.slice_m[adobe::extents_slices_t::horizontal].child_alignment_m); } } *************** *** 283,287 **** { (*alignment_table_g)( iter->second.get<adobe::name_t>(), ! data.slice_m[adobe::rectangle_slices_t::vertical].child_alignment_m); } } --- 283,287 ---- { (*alignment_table_g)( iter->second.get<adobe::name_t>(), ! data.slice_m[adobe::extents_slices_t::vertical].child_alignment_m); } } *************** *** 427,431 **** /*************************************************************************************************/ ! class eve_t::implementation_t : private rectangle_slices_t { public: --- 427,431 ---- /*************************************************************************************************/ ! class eve_t::implementation_t : private extents_slices_t { public: *************** *** 1039,1043 **** long length = zero_length; ! guides_t::iterator guide_iter(pslice.guides_m.begin()); for (child_iterator iter (first); iter != riter.base(); ++iter) { --- 1039,1043 ---- long length = zero_length; ! guide_set_t::iterator guide_iter(pslice.guide_set_m.begin()); for (child_iterator iter (first); iter != riter.base(); ++iter) { *************** *** 1078,1084 **** long guide_length(0); ! if ((iter->geometry_m.placement_m == place_leaf) && iter_pslice.guides_m.size()) { ! guide_length = *guide_iter - (iter_pslice.guides_m.front() + length); length += guide_length; } --- 1078,1084 ---- long guide_length(0); ! if ((iter->geometry_m.placement_m == place_leaf) && iter_pslice.guide_set_m.size()) { ! guide_length = *guide_iter - (iter_pslice.guide_set_m.front() + length); length += guide_length; } *************** *** 1121,1125 **** length += iter_pslice.length_m; ! std::advance(guide_iter, guides_t::difference_type(iter_pslice.guides_m.size())); } } --- 1121,1125 ---- length += iter_pslice.length_m; ! std::advance(guide_iter, guide_set_t::difference_type(iter_pslice.guide_set_m.size())); } } *************** *** 1170,1176 **** long guide_length(0); ! if ((iter->geometry_m.placement_m == place_leaf) && iter_pslice.guides_m.size()) { ! guide_length = pslice.guides_m.front() - (iter_pslice.guides_m.front() + iter_length); iter_length += guide_length; } --- 1170,1176 ---- long guide_length(0); ! if ((iter->geometry_m.placement_m == place_leaf) && iter_pslice.guide_set_m.size()) { ! guide_length = pslice.guide_set_m.front() - (iter_pslice.guide_set_m.front() + iter_length); iter_length += guide_length; } *************** *** 1240,1244 **** */ ! pslice.guides_m.clear(); /* --- 1240,1244 ---- */ ! pslice.guide_set_m.clear(); /* *************** *** 1254,1261 **** eve_t::place_data_t::slice_t& iter_pslice(iter->place_m.slice_m[select]); ! guide_count += iter_pslice.guides_m.size(); } ! pslice.guides_m.resize(guide_count); } --- 1254,1261 ---- eve_t::place_data_t::slice_t& iter_pslice(iter->place_m.slice_m[select]); ! guide_count += iter_pslice.guide_set_m.size(); } ! pslice.guide_set_m.resize(guide_count); } *************** *** 1273,1277 **** */ ! pslice.guides_m.clear(); std::size_t guide_count(0); --- 1273,1277 ---- */ ! pslice.guide_set_m.clear(); std::size_t guide_count(0); *************** *** 1283,1290 **** eve_t::place_data_t::slice_t& iter_pslice(iter->place_m.slice_m[select]); ! guide_count = std::max(guide_count, iter_pslice.guides_m.size()); } ! pslice.guides_m.resize(guide_count); } --- 1283,1290 ---- eve_t::place_data_t::slice_t& iter_pslice(iter->place_m.slice_m[select]); ! guide_count = std::max(guide_count, iter_pslice.guide_set_m.size()); } ! pslice.guide_set_m.resize(guide_count); } *************** *** 1298,1302 **** long length(gslice.frame_m.first + gslice.margin_m.first); eve_t::calculate_data_t::spacing_t::const_iterator spacing_iter(geometry_m.spacing_m.begin()); ! guides_t::iterator guide_iter(pslice.guides_m.begin()); // accumulate the length and update the position. --- 1298,1302 ---- long length(gslice.frame_m.first + gslice.margin_m.first); eve_t::calculate_data_t::spacing_t::const_iterator spacing_iter(geometry_m.spacing_m.begin()); ! guide_set_t::iterator guide_iter(pslice.guide_set_m.begin()); // accumulate the length and update the position. *************** *** 1308,1322 **** eve_t::place_data_t::slice_t& iter_pslice(iter->place_m.slice_m[select]); ! guides_t::iterator first_guide (guide_iter); ! for (guides_t::iterator guide(iter_pslice.guides_m.begin()); ! guide != iter_pslice.guides_m.end(); ++guide, ++guide_iter) { *guide_iter = std::max(*guide_iter, *guide + length); } ! if ((iter->geometry_m.placement_m == place_leaf) && iter_pslice.guides_m.size()) { ! length = *first_guide - iter_pslice.guides_m.front(); } --- 1308,1322 ---- eve_t::place_data_t::slice_t& iter_pslice(iter->place_m.slice_m[select]); ! guide_set_t::iterator first_guide (guide_iter); ! for (guide_set_t::iterator guide(iter_pslice.guide_set_m.begin()); ! guide != iter_pslice.guide_set_m.end(); ++guide, ++guide_iter) { *guide_iter = std::max(*guide_iter, *guide + length); } ! if ((iter->geometry_m.placement_m == place_leaf) && iter_pslice.guide_set_m.size()) { ! length = *first_guide - iter_pslice.guide_set_m.front(); } *************** *** 1326,1336 **** // balance the guides ! if (gslice.balance_m && pslice.guides_m.size() > 2) { ! guides_t::iterator iter(adobe::max_adjacent_difference(pslice.guides_m)); ! guides_t::iterator previous(iter); ++iter; ! guides_t::value_type difference(*iter - *previous); ! guides_t::value_type accumulate(pslice.guides_m.front()); /* --- 1326,1336 ---- // balance the guides ! if (gslice.balance_m && pslice.guide_set_m.size() > 2) { ! guide_set_t::iterator iter(adobe::max_adjacent_difference(pslice.guide_set_m)); ! guide_set_t::iterator previous(iter); ++iter; ! guide_set_t::value_type difference(*iter - *previous); ! guide_set_t::value_type accumulate(pslice.guide_set_m.front()); /* *************** *** 1339,1343 **** */ ! for (guides_t::iterator first(adobe::advance_of(pslice.guides_m.begin())), last(pslice.guides_m.end()); first != last; ++first) { --- 1339,1343 ---- */ ! for (guide_set_t::iterator first(adobe::advance_of(pslice.guide_set_m.begin())), last(pslice.guide_set_m.end()); first != last; ++first) { *************** *** 1383,1388 **** if (iter_gslice.suppress_m) continue; ! guides_t::iterator guide_iter (pslice.guides_m.begin()); ! for (guides_t::iterator guide(iter_pslice.guides_m.begin()); guide != iter_pslice.guides_m.end(); ++guide, ++guide_iter) { *guide_iter = std::max(*guide_iter, *guide + iter_length); --- 1383,1388 ---- if (iter_gslice.suppress_m) continue; ! guide_set_t::iterator guide_iter (pslice.guide_set_m.begin()); ! for (guide_set_t::iterator guide(iter_pslice.guide_set_m.begin()); guide != iter_pslice.guide_set_m.end(); ++guide, ++guide_iter) { *guide_iter = std::max(*guide_iter, *guide + iter_length); *************** *** 1418,1424 **** } ! if ((iter->geometry_m.placement_m == place_leaf) && iter_pslice.guides_m.size()) { ! iter_length += pslice.guides_m.front() - (iter_pslice.guides_m.front() + iter_length); } --- 1418,1424 ---- } ! if ((iter->geometry_m.placement_m == place_leaf) && iter_pslice.guide_set_m.size()) { ! iter_length += pslice.guide_set_m.front() - (iter_pslice.guide_set_m.front() + iter_length); } *************** *** 1442,1446 **** long length(gslice.frame_m.first + gslice.margin_m.first); eve_t::calculate_data_t::spacing_t::const_iterator spacing_iter(geometry_m.spacing_m.begin()); ! guides_t::iterator guide_iter(pslice.guides_m.begin()); // accumulate the length and update the position. --- 1442,1446 ---- long length(gslice.frame_m.first + gslice.margin_m.first); eve_t::calculate_data_t::spacing_t::const_iterator spacing_iter(geometry_m.spacing_m.begin()); ! guide_set_t::iterator guide_iter(pslice.guide_set_m.begin()); // accumulate the length and update the position. *************** *** 1452,1457 **** eve_t::place_data_t::slice_t& iter_pslice(iter->place_m.slice_m[select]); ! guides_t::iterator guide(iter_pslice.guides_m.begin()); ! guides_t::iterator guide_last(iter_pslice.guides_m.end()); if ((iter->geometry_m.placement_m == place_leaf) && guide != guide_last) --- 1452,1457 ---- eve_t::place_data_t::slice_t& iter_pslice(iter->place_m.slice_m[select]); ! guide_set_t::iterator guide(iter_pslice.guide_set_m.begin()); ! guide_set_t::iterator guide_last(iter_pslice.guide_set_m.end()); if ((iter->geometry_m.placement_m == place_leaf) && guide != guide_last) *************** *** 1496,1500 **** if (iter_gslice.suppress_m) continue; ! guides_t::iterator guide_iter(pslice.guides_m.begin()); // Leaf nodes are offset to the first guide. --- 1496,1500 ---- if (iter_gslice.suppress_m) continue; ! guide_set_t::iterator guide_iter(pslice.guide_set_m.begin()); // Leaf nodes are offset to the first guide. *************** *** 1512,1517 **** } ! guides_t::iterator guide(iter_pslice.guides_m.begin()); ! guides_t::iterator guide_last(iter_pslice.guides_m.end()); if (iter->geometry_m.placement_m == place_leaf && guide != guide_last) --- 1512,1517 ---- } ! guide_set_t::iterator guide(iter_pslice.guide_set_m.begin()); ! guide_set_t::iterator guide_last(iter_pslice.guide_set_m.end()); if (iter->geometry_m.placement_m == place_leaf && guide != guide_last) *************** *** 1593,1597 **** length_m = data.length_m; outset_m = data.outset_m; ! guides_m = data.guides_m; return *this; --- 1593,1597 ---- length_m = data.length_m; outset_m = data.outset_m; ! guide_set_m = data.guide_set_m; return *this; --- NEW FILE: extents.cpp --- /* Copyright 2005 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) */ /****************************************************************************************************/ #include <adobe/extents.hpp> #include <adobe/algorithm.hpp> #if defined(ADOBE_SERIALIZATION) #include <adobe/future/iomanip.hpp> #include <adobe/name.hpp> #include <iostream> #endif /****************************************************************************************************/ namespace adobe { /****************************************************************************************************/ bool operator == (const adobe::extents_t& x, const adobe::extents_t& y) { return x.slice_m[adobe::extents_slices_t::vertical] == y.slice_m[adobe::extents_slices_t::vertical] && x.slice_m[adobe::extents_slices_t::horizontal] == y.slice_m[adobe::extents_slices_t::horizontal]; } /****************************************************************************************************/ #if defined(ADOBE_SERIALIZATION) std::ostream& operator << (std::ostream& s, const adobe::extents_t& x) { static adobe::value_t key_vertical (adobe::static_name_t("vertical")); static adobe::value_t key_horizontal (adobe::static_name_t("horizontal")); s << adobe::begin_bag("[0]"); s << adobe::begin_sequence; s << adobe::format(key_vertical); s << adobe::format(x.slice_m[adobe::extents_slices_t::vertical]); s << adobe::end_sequence; s << adobe::begin_sequence; s << adobe::format(key_horizontal); s << adobe::format(x.slice_m[adobe::extents_slices_t::horizontal]); s << adobe::end_sequence; s << adobe::end_bag; return s; } #endif /****************************************************************************************************/ bool operator == (const adobe::extents_t::slice_t& x, const adobe::extents_t::slice_t& y) { return x.length_m == y.length_m && x.outset_m == y.outset_m && x.frame_m == y.frame_m && x.inset_m == y.inset_m && x.poi_m.size() == y.poi_m.size() && adobe::equal(x.poi_m, y.poi_m.begin()); } /****************************************************************************************************/ #if defined(ADOBE_SERIALIZATION) std::ostream& operator << (std::ostream& s, const adobe::extents_t::slice_t& x) { static adobe::value_t key_length (adobe::static_name_t("length")); static adobe::value_t key_outset (adobe::static_name_t("outset")); static adobe::value_t key_frame (adobe::static_name_t("frame")); static adobe::value_t key_inset (adobe::static_name_t("inset")); static adobe::value_t key_poi_set (adobe::static_name_t("poi_set")); adobe::guide_set_t::const_iterator first(x.poi_m.begin()); adobe::guide_set_t::const_iterator last(x.poi_m.end()); adobe::guide_set_t::const_iterator back(last - 1); s << adobe::begin_bag("[0]") << adobe::begin_sequence << adobe::format(key_length) << adobe::format(x.length_m) << adobe::end_sequence << adobe::begin_sequence << adobe::format(key_outset) << adobe::begin_sequence << adobe::format(x.outset_m.first) << adobe::format(x.outset_m.second) << adobe::end_sequence << adobe::end_sequence << adobe::begin_sequence << adobe::format(key_frame) << adobe::begin_sequence << adobe::format(x.frame_m.first) << adobe::format(x.frame_m.second) << adobe::end_sequence << adobe::end_sequence << adobe::begin_sequence << adobe::format(key_inset) << adobe::begin_sequence << adobe::format(x.inset_m.first) << adobe::format(x.inset_m.second) << adobe::end_sequence << adobe::end_sequence << adobe::begin_sequence << adobe::format(key_poi_set) << adobe::begin_sequence; for (; first != last; ++first) s << adobe::format(*first); s << adobe::end_sequence << adobe::end_sequence << adobe::end_bag; return s; } #endif /****************************************************************************************************/ } // namespace adobe /****************************************************************************************************/ --- rectangle.cpp DELETED --- |
|
From: Foster B. <fos...@us...> - 2005-04-19 17:56:31
|
Update of /cvsroot/adobe-source/sandbox/visual_refactor/adobe/documentation/sources In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32418/adobe/documentation/sources Modified Files: documentation.doxygen Log Message: rectangle now extents; started work on the ui_core, client_assembler API cleanup Index: documentation.doxygen =================================================================== RCS file: /cvsroot/adobe-source/sandbox/visual_refactor/adobe/documentation/sources/documentation.doxygen,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** documentation.doxygen 18 Apr 2005 21:15:39 -0000 1.1 --- documentation.doxygen 19 Apr 2005 17:55:52 -0000 1.2 *************** *** 496,500 **** ./tutorials \ ./widget_lib/widget_lib.dox \ - ./widget_lib/widget_metrics.dox \ ./widget_lib/widget_reference.dox \ ../../algorithm.hpp \ --- 496,499 ---- *************** *** 514,517 **** --- 513,517 ---- ../../eve_parser.hpp \ ../../eve_evaluate.hpp \ + ../../extents.hpp \ ../../final.hpp \ ../../forest.hpp \ *************** *** 522,526 **** ../../name_fwd.hpp \ ../../once.hpp \ - ../../rectangle.hpp \ ../../static_table.hpp \ ../../string.hpp \ --- 522,525 ---- *************** *** 537,540 **** --- 536,540 ---- ../../source/eve_parser.cpp \ ../../source/eve_evaluate.cpp \ + ../../source/extents.cpp \ ../../source/istream.cpp \ ../../source/lex_stream_fwd.hpp \ *************** *** 542,546 **** ../../source/lex_stream.hpp \ ../../source/name.cpp \ - ../../source/rectangle.cpp \ ../../source/token.cpp \ ../../source/token.hpp \ --- 542,545 ---- *************** *** 549,554 **** --- 548,555 ---- ../../source/virtual_machine.cpp \ ../../source/xstr.cpp \ + ../../test/visual/headers/ui_core.hpp \ ../../test/visual/headers/ui_core_common.hpp \ ../../test/visual/headers/mac/ui_core_implementation.hpp \ + ../../test/visual/sources/ui_core.cpp \ ../../test/visual/sources/ui_core_common.cpp |
|
From: Foster B. <fos...@us...> - 2005-04-19 17:56:30
|
Update of /cvsroot/adobe-source/sandbox/visual_refactor/adobe/build/asl_lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32418/adobe/build/asl_lib Modified Files: asl_lib.mcp Log Message: rectangle now extents; started work on the ui_core, client_assembler API cleanup Index: asl_lib.mcp =================================================================== RCS file: /cvsroot/adobe-source/sandbox/visual_refactor/adobe/build/asl_lib/asl_lib.mcp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvscCFuAY and /tmp/cvsmr5fik differ |
|
From: Foster B. <fos...@us...> - 2005-04-19 17:56:30
|
Update of /cvsroot/adobe-source/sandbox/visual_refactor/adobe/build/asl_lib_dev In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32418/adobe/build/asl_lib_dev Modified Files: asl_lib_dev.mcp Log Message: rectangle now extents; started work on the ui_core, client_assembler API cleanup Index: asl_lib_dev.mcp =================================================================== RCS file: /cvsroot/adobe-source/sandbox/visual_refactor/adobe/build/asl_lib_dev/asl_lib_dev.mcp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvsTTuHY9 and /tmp/cvsx5CmNv differ |
|
From: Foster B. <fos...@us...> - 2005-04-19 17:56:29
|
Update of /cvsroot/adobe-source/sandbox/visual_refactor/adobe In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32418/adobe Modified Files: eve.hpp Added Files: extents.hpp Removed Files: rectangle.hpp Log Message: rectangle now extents; started work on the ui_core, client_assembler API cleanup Index: eve.hpp =================================================================== RCS file: /cvsroot/adobe-source/sandbox/visual_refactor/adobe/eve.hpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** eve.hpp 18 Apr 2005 21:15:35 -0000 1.1 --- eve.hpp 19 Apr 2005 17:55:48 -0000 1.2 *************** *** 21,25 **** #include <adobe/name_fwd.hpp> #include <adobe/virtual_machine.hpp> ! #include <adobe/rectangle.hpp> #include <adobe/source/expression_parser.hpp> --- 21,25 ---- #include <adobe/name_fwd.hpp> #include <adobe/virtual_machine.hpp> ! #include <adobe/extents.hpp> #include <adobe/source/expression_parser.hpp> *************** *** 33,37 **** class eve_t #if !defined(ADOBE_NO_DOCUMENTATION) ! : boost::noncopyable, public rectangle_slices_t #endif { --- 33,37 ---- class eve_t #if !defined(ADOBE_NO_DOCUMENTATION) ! : boost::noncopyable, public extents_slices_t #endif { *************** *** 118,126 **** /*************************************************************************************************/ - typedef points_of_interest_t guides_t; - struct eve_t::calculate_data_t #if !defined(ADOBE_NO_DOCUMENTATION) ! : rectangle_slices_t #endif { --- 118,124 ---- /*************************************************************************************************/ struct eve_t::calculate_data_t #if !defined(ADOBE_NO_DOCUMENTATION) ! : extents_slices_t #endif { *************** *** 136,140 **** pair_long_t outset_m; eve_t::alignment_t alignment_m; ! guides_t guides_m; bool suppress_m; bool balance_m; --- 134,138 ---- pair_long_t outset_m; eve_t::alignment_t alignment_m; ! guide_set_t guide_set_m; bool suppress_m; bool balance_m; *************** *** 160,164 **** struct eve_t::place_data_t #if !defined(ADOBE_NO_DOCUMENTATION) ! : rectangle_slices_t #endif { --- 158,162 ---- struct eve_t::place_data_t #if !defined(ADOBE_NO_DOCUMENTATION) ! : extents_slices_t #endif { *************** *** 177,181 **** long position_m; pair_long_t outset_m; ! guides_t guides_m; }; --- 175,179 ---- long position_m; pair_long_t outset_m; ! guide_set_t guide_set_m; }; --- rectangle.hpp DELETED --- --- NEW FILE: extents.hpp --- /* Copyright 2005 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_EXTENTS_HPP #define ADOBE_EXTENTS_HPP #include <boost/array.hpp> #include <boost/operators.hpp> #include <vector> /****************************************************************************************************/ namespace adobe { /****************************************************************************************************/ template <typename T> struct point_2d; struct extents_t; /****************************************************************************************************/ } // namespace adobe /*************************************************************************************************/ void swap(adobe::extents_t&, adobe::extents_t&); template <typename T> bool operator == (const adobe::point_2d<T>&, const adobe::point_2d<T>&); /****************************************************************************************************/ namespace adobe { /****************************************************************************************************/ template <typename T = long> struct point_2d { point_2d() : x_m(T()), y_m(T()) { } point_2d(const T& x, const T& y) : x_m(x), y_m(y) { } point_2d(const point_2d& rhs) : x_m(rhs.x_m), y_m(rhs.y_m) { } point_2d& operator = (const point_2d& rhs) { x_m = rhs.x_m; y_m = rhs.y_m; return *this; } T x_m; T y_m; }; typedef std::pair<long, long> pair_long_t; typedef point_2d<long> point_2d_t; typedef std::vector<long> guide_set_t; // REVISIT (sparent) : points of interest need to be named entities. This will become: #if 0 struct guide_set_t { adobe::name_t name_m; long offset_m; }; typedef std::vector<guide_set_t> point_of_interest_set_t; #endif // REVISIT (sparent) : Open issue - are there "alignment" attributes on POIs? struct extents_slices_t { enum slice_select_t { horizontal, vertical }; }; /****************************************************************************************************/ struct extents_t : #if !defined(ADOBE_NO_DOCUMENTATION) private extents_slices_t, boost::equality_comparable<extents_t> #endif { struct slice_t : boost::equality_comparable<slice_t> { slice_t() : length_m(0) { }; long length_m; pair_long_t outset_m; pair_long_t frame_m; pair_long_t inset_m; guide_set_t poi_m; #if !defined(ADOBE_NO_DOCUMENTATION) friend bool operator == (const adobe::extents_t::slice_t& x, const adobe::extents_t::slice_t& y); #if defined(ADOBE_SERIALIZATION) friend std::ostream& operator << (std::ostream& s, const adobe::extents_t::slice_t& x); #endif #endif }; boost::array<slice_t, 2> slice_m; slice_t& vertical() { return slice_m[extents_slices_t::vertical]; } slice_t& horizontal() { return slice_m[extents_slices_t::horizontal]; } const slice_t& vertical() const { return slice_m[extents_slices_t::vertical]; } const slice_t& horizontal() const { return slice_m[extents_slices_t::horizontal]; } long& height() { return vertical().length_m; } long& width() { return horizontal().length_m; } const long& height() const { return vertical().length_m; } const long& width() const { return horizontal().length_m; } #if !defined(ADOBE_NO_DOCUMENTATION) friend void ::swap(adobe::extents_t&, adobe::extents_t&); friend bool operator == (const adobe::extents_t& x, const adobe::extents_t& y); #if defined(ADOBE_SERIALIZATION) friend std::ostream& operator << (std::ostream& s, const adobe::extents_t& x); #endif #endif }; /****************************************************************************************************/ bool operator == (const adobe::extents_t& x, const adobe::extents_t& y); #if defined(ADOBE_SERIALIZATION) std::ostream& operator << (std::ostream& s, const adobe::extents_t& x); #endif bool operator == (const adobe::extents_t::slice_t& x, const adobe::extents_t::slice_t& y); #if defined(ADOBE_SERIALIZATION) std::ostream& operator << (std::ostream& s, const adobe::extents_t::slice_t& x); #endif /****************************************************************************************************/ } // namespace adobe /*************************************************************************************************/ inline void swap(adobe::extents_t& x, adobe::extents_t& y) { std::swap(x.slice_m, y.slice_m); } /****************************************************************************************************/ template <typename T> bool operator == (const adobe::point_2d<T>& a, const adobe::point_2d<T>& b) { return a.x_m == b.x_m && a.y_m == b.y_m; } /****************************************************************************************************/ #endif /****************************************************************************************************/ |
|
From: Foster B. <fos...@us...> - 2005-04-19 17:56:23
|
Update of /cvsroot/adobe-source/sandbox/visual_refactor/adobe/test/visual/sources/win In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32418/adobe/test/visual/sources/win Modified Files: ui_core_implementation.cpp Log Message: rectangle now extents; started work on the ui_core, client_assembler API cleanup Index: ui_core_implementation.cpp =================================================================== RCS file: /cvsroot/adobe-source/sandbox/visual_refactor/adobe/test/visual/sources/win/ui_core_implementation.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ui_core_implementation.cpp 18 Apr 2005 21:16:06 -0000 1.1 --- ui_core_implementation.cpp 19 Apr 2005 17:56:00 -0000 1.2 *************** *** 139,143 **** /****************************************************************************************************/ ! adobe::dictionary_t rectangle_slice_to_dictionary(const adobe::rectangle_t::slice_t& s) { adobe::dictionary_t result; --- 139,143 ---- /****************************************************************************************************/ ! adobe::dictionary_t extents_slice_to_dictionary(const adobe::extents_t::slice_t& s) { adobe::dictionary_t result; *************** *** 184,193 **** /****************************************************************************************************/ ! adobe::dictionary_t rectangle_to_dictionary(const adobe::rectangle_t& r) { adobe::dictionary_t result; ! result.set(adobe::static_name_t("vertical"), rectangle_slice_to_dictionary(r.slice_m[adobe::rectangle_slices_t::vertical])); ! result.set(adobe::static_name_t("horizontal"), rectangle_slice_to_dictionary(r.slice_m[adobe::rectangle_slices_t::horizontal])); return result; --- 184,193 ---- /****************************************************************************************************/ ! adobe::dictionary_t extents_to_dictionary(const adobe::extents_t& r) { adobe::dictionary_t result; ! result.set(adobe::static_name_t("vertical"), extents_slice_to_dictionary(r.slice_m[adobe::extents_slices_t::vertical])); ! result.set(adobe::static_name_t("horizontal"), extents_slice_to_dictionary(r.slice_m[adobe::extents_slices_t::horizontal])); return result; *************** *** 640,645 **** { ! adobe::points_of_interest_t::const_iterator iter(control.geometry_m.slice_m[adobe::rectangle_slices_t::horizontal].poi_m.begin()); ! adobe::points_of_interest_t::const_iterator last(control.geometry_m.slice_m[adobe::rectangle_slices_t::horizontal].poi_m.end()); for (; iter != last; ++iter) { --- 640,645 ---- { ! adobe::points_of_interest_t::const_iterator iter(control.geometry_m.slice_m[adobe::extents_slices_t::horizontal].poi_m.begin()); ! adobe::points_of_interest_t::const_iterator last(control.geometry_m.slice_m[adobe::extents_slices_t::horizontal].poi_m.end()); for (; iter != last; ++iter) { *************** *** 655,660 **** { ! adobe::points_of_interest_t::const_iterator iter(control.geometry_m.slice_m[adobe::rectangle_slices_t::vertical].poi_m.begin()); ! adobe::points_of_interest_t::const_iterator last(control.geometry_m.slice_m[adobe::rectangle_slices_t::vertical].poi_m.end()); for (; iter != last; ++iter) { --- 655,660 ---- { ! adobe::points_of_interest_t::const_iterator iter(control.geometry_m.slice_m[adobe::extents_slices_t::vertical].poi_m.begin()); ! adobe::points_of_interest_t::const_iterator last(control.geometry_m.slice_m[adobe::extents_slices_t::vertical].poi_m.end()); for (; iter != last; ++iter) { *************** *** 776,782 **** /// \return the best bounds for the edit control, including baseline. // ! ::adobe::rectangle_t calculate_edit_bounds(HWND control, int cols, int rows) { ! ::adobe::rectangle_t result; // // First make sure that we have a valid control. --- 776,782 ---- /// \return the best bounds for the edit control, including baseline. // ! ::adobe::extents_t calculate_edit_bounds(HWND control, int cols, int rows) { ! ::adobe::extents_t result; // // First make sure that we have a valid control. *************** *** 817,821 **** result.height() = (wi.rcClient.top - wi.rcWindow.top) + (wi.rcWindow.bottom - wi.rcClient.bottom) + (rows * font_metrics.tmHeight) + em_rect.top + border; result.width() = (extents.right - extents.left) + (wi.rcClient.left - wi.rcWindow.left) + (wi.rcWindow.right - wi.rcClient.right); ! result.slice_m[::adobe::rectangle_slices_t::vertical].poi_m.push_back((wi.rcClient.top - wi.rcWindow.top) + font_metrics.tmAscent + border); return result; } --- 817,821 ---- result.height() = (wi.rcClient.top - wi.rcWindow.top) + (wi.rcWindow.bottom - wi.rcClient.bottom) + (rows * font_metrics.tmHeight) + em_rect.top + border; result.width() = (extents.right - extents.left) + (wi.rcClient.left - wi.rcWindow.left) + (wi.rcWindow.right - wi.rcClient.right); ! result.slice_m[::adobe::extents_slices_t::vertical].poi_m.push_back((wi.rcClient.top - wi.rcWindow.top) + font_metrics.tmAscent + border); return result; } *************** *** 840,846 **** /// \return the best bounds for this widget, based on the given information. // ! ::adobe::rectangle_t calculate_best_bounds(const SIZE* widget_size, const MARGINS* widget_margins, const TEXTMETRIC* font_metrics, const RECT* text_extents, const int* border ) { ! ::adobe::rectangle_t result; // // First we need to try and calculate the baseline of the text in the widget. --- 840,846 ---- /// \return the best bounds for this widget, based on the given information. // ! ::adobe::extents_t calculate_best_bounds(const SIZE* widget_size, const MARGINS* widget_margins, const TEXTMETRIC* font_metrics, const RECT* text_extents, const int* border ) { ! ::adobe::extents_t result; // // First we need to try and calculate the baseline of the text in the widget. *************** *** 880,884 **** // Store the baseline away in our result. // ! result.slice_m[::adobe::rectangle_slices_t::vertical].poi_m.push_back(baseline); } // --- 880,884 ---- // Store the baseline away in our result. // ! result.slice_m[::adobe::extents_slices_t::vertical].poi_m.push_back(baseline); } // *************** *** 1366,1370 **** /****************************************************************************************************/ ! void window_t::implementation_t::set_bounds(const point_t& position, const rectangle_t& geometry) { assert(window_m); --- 1366,1370 ---- /****************************************************************************************************/ ! void window_t::implementation_t::set_bounds(const point_t& position, const extents_t& geometry) { assert(window_m); *************** *** 1469,1473 **** #endif ! result.set(static_name_t("geometry"), rectangle_to_dictionary(geometry_m)); result.set(static_name_t("name"), window_title); --- 1469,1473 ---- #endif ! result.set(static_name_t("geometry"), extents_to_dictionary(geometry_m)); result.set(static_name_t("name"), window_title); *************** *** 1623,1631 **** /****************************************************************************************************/ ! rectangle_t control_t::best_bounds() { assert(control_m); ! rectangle_t result; metrics_t::get_instance().set_window(control_m); // --- 1623,1631 ---- /****************************************************************************************************/ ! extents_t control_t::best_bounds() { assert(control_m); ! extents_t result; metrics_t::get_instance().set_window(control_m); // *************** *** 1634,1638 **** // anyway. // ! if (!uxtheme_type_m) return rectangle_t(); // // Discover the size of the widget. --- 1634,1638 ---- // anyway. // ! if (!uxtheme_type_m) return extents_t(); // // Discover the size of the widget. *************** *** 1671,1680 **** /****************************************************************************************************/ ! void control_t::set_bounds(const point_t& pos, const rectangle_t& geo) { assert(control_m); point_t position(pos); ! rectangle_t geometry(geo); RECT new_bounds = --- 1671,1680 ---- /****************************************************************************************************/ ! void control_t::set_bounds(const point_t& pos, const extents_t& geo) { assert(control_m); point_t position(pos); ! extents_t geometry(geo); RECT new_bounds = *************** *** 1841,1845 **** dictionary_t result; ! rectangle_t geometry; RECT bounds; --- 1841,1845 ---- dictionary_t result; ! extents_t geometry; RECT bounds; *************** *** 1851,1855 **** result.set(static_name_t("widget_type"), std::string("control_core")); result.set(static_name_t("theme"), theme_m); ! result.set(static_name_t("geometry"), rectangle_to_dictionary(geometry)); return result; --- 1851,1855 ---- result.set(static_name_t("widget_type"), std::string("control_core")); result.set(static_name_t("theme"), theme_m); ! result.set(static_name_t("geometry"), extents_to_dictionary(geometry)); return result; *************** *** 1923,1933 **** /****************************************************************************************************/ ! rectangle_t group_t::implementation_t::best_bounds() { assert(control_m); ! rectangle_t result(_super::best_bounds()); ! result.slice_m[rectangle_slices_t::vertical].frame_m.first = result.height(); return result; --- 1923,1933 ---- /****************************************************************************************************/ ! extents_t group_t::implementation_t::best_bounds() { assert(control_m); ! extents_t result(_super::best_bounds()); ! result.slice_m[extents_slices_t::vertical].frame_m.first = result.height(); return result; *************** *** 2030,2043 **** /****************************************************************************************************/ ! rectangle_t tab_group_t::implementation_t::best_bounds() { assert(control_m); ! rectangle_t result; // REVISIT (fbrereto) : Static values result.height() = 15; ! result.slice_m[rectangle_slices_t::vertical].frame_m.first = 20; return result; --- 2030,2043 ---- /****************************************************************************************************/ ! extents_t tab_group_t::implementation_t::best_bounds() { assert(control_m); ! extents_t result; // REVISIT (fbrereto) : Static values result.height() = 15; ! result.slice_m[extents_slices_t::vertical].frame_m.first = 20; return result; *************** *** 2626,2630 **** /****************************************************************************************************/ ! void link_t::implementation_t::set_bounds(const point_t& position, const rectangle_t& geometry) { assert(control_m); --- 2626,2630 ---- /****************************************************************************************************/ ! void link_t::implementation_t::set_bounds(const point_t& position, const extents_t& geometry) { assert(control_m); *************** *** 2634,2638 **** prongs_m.erase(prongs_m.begin(), prongs_m.end()); ! copy(geometry.slice_m[rectangle_slices_t::vertical].poi_m, std::back_inserter(prongs_m)); } --- 2634,2638 ---- prongs_m.erase(prongs_m.begin(), prongs_m.end()); ! copy(geometry.slice_m[extents_slices_t::vertical].poi_m, std::back_inserter(prongs_m)); } *************** *** 2753,2757 **** /****************************************************************************************************/ ! rectangle_t progress_bar_t::implementation_t::best_bounds() { assert(control_m); --- 2753,2757 ---- /****************************************************************************************************/ ! extents_t progress_bar_t::implementation_t::best_bounds() { assert(control_m); *************** *** 2761,2765 **** // ! rectangle_t result; long height(is_vertical_m ? 100 : 15); long width(is_vertical_m ? 15 : 100); --- 2761,2765 ---- // ! extents_t result; long height(is_vertical_m ? 100 : 15); long width(is_vertical_m ? 15 : 100); *************** *** 2931,2935 **** set_control_bounds(control_m, static_bounds); ! rectangle_t best_bounds_result(_super::best_bounds()); return best_bounds_result.height(); --- 2931,2935 ---- set_control_bounds(control_m, static_bounds); ! extents_t best_bounds_result(_super::best_bounds()); return best_bounds_result.height(); *************** *** 3092,3096 **** /****************************************************************************************************/ ! rectangle_t edit_text_t::implementation_t::best_bounds() { assert(control_m); --- 3092,3096 ---- /****************************************************************************************************/ ! extents_t edit_text_t::implementation_t::best_bounds() { assert(control_m); *************** *** 3099,3103 **** // should be, based on the number of rows and columns. // ! rectangle_t result = calculate_edit_bounds(control_m, cols_m, rows_m); // // Store the height and baseline so that we can correctly align the edit widget --- 3099,3103 ---- // should be, based on the number of rows and columns. // ! extents_t result = calculate_edit_bounds(control_m, cols_m, rows_m); // // Store the height and baseline so that we can correctly align the edit widget *************** *** 3105,3109 **** // edit_height_m = result.height(); ! edit_baseline_m = result.slice_m[rectangle_slices_t::vertical].poi_m[0]; // // If we have a label then we need to make extra space --- 3105,3109 ---- // edit_height_m = result.height(); ! edit_baseline_m = result.slice_m[extents_slices_t::vertical].poi_m[0]; // // If we have a label then we need to make extra space *************** *** 3111,3120 **** // if (!using_label_m) return result; ! rectangle_t label_bounds = get_label().best_bounds(); // // Make sure that the height can accomodate both the label // and the edit widget. // ! align_slices(result.slice_m[rectangle_slices_t::vertical], label_bounds.slice_m[rectangle_slices_t::vertical]); // // We put the label on the left side of the edit box, and --- 3111,3120 ---- // if (!using_label_m) return result; ! extents_t label_bounds = get_label().best_bounds(); // // Make sure that the height can accomodate both the label // and the edit widget. // ! align_slices(result.slice_m[extents_slices_t::vertical], label_bounds.slice_m[extents_slices_t::vertical]); // // We put the label on the left side of the edit box, and *************** *** 3123,3127 **** // result.width() += gap + label_bounds.width(); ! result.slice_m[rectangle_slices_t::horizontal].poi_m.push_back(label_bounds.width()); // // We use the height and baseline of the label to size and --- 3123,3127 ---- // result.width() += gap + label_bounds.width(); ! result.slice_m[extents_slices_t::horizontal].poi_m.push_back(label_bounds.width()); // // We use the height and baseline of the label to size and *************** *** 3129,3133 **** // static_height_m = label_bounds.height(); ! static_baseline_m = label_bounds.slice_m[rectangle_slices_t::vertical].poi_m[0]; return result; } --- 3129,3133 ---- // static_height_m = label_bounds.height(); ! static_baseline_m = label_bounds.slice_m[extents_slices_t::vertical].poi_m[0]; return result; } *************** *** 3135,3147 **** /****************************************************************************************************/ ! void edit_text_t::implementation_t::set_bounds(const point_t& pos, const rectangle_t& geo) { assert(control_m); point_t position(pos); ! rectangle_t geometry(geo); geometry_m = geometry; ! long baseline = geometry.slice_m[rectangle_slices_t::vertical].poi_m[0]; if (using_label_m) { --- 3135,3147 ---- /****************************************************************************************************/ ! void edit_text_t::implementation_t::set_bounds(const point_t& pos, const extents_t& geo) { assert(control_m); point_t position(pos); ! extents_t geometry(geo); geometry_m = geometry; ! long baseline = geometry.slice_m[extents_slices_t::vertical].poi_m[0]; if (using_label_m) { *************** *** 3151,3155 **** // correctly translate the label for baseline alignment. // ! adobe::rectangle_t label_geometry; adobe::point_t label_position(position); // --- 3151,3155 ---- // correctly translate the label for baseline alignment. // ! adobe::extents_t label_geometry; adobe::point_t label_position(position); // *************** *** 3159,3163 **** // label_geometry.height() = static_height_m; ! label_geometry.width() = geometry.slice_m[rectangle_slices_t::horizontal].poi_m[0]; // // Translate the label vertically for baseline alignment with the --- 3159,3163 ---- // label_geometry.height() = static_height_m; ! label_geometry.width() = geometry.slice_m[extents_slices_t::horizontal].poi_m[0]; // // Translate the label vertically for baseline alignment with the *************** *** 3203,3207 **** long top(bounds.top); long left(bounds.left); ! rectangle_t rect; point_t position(left + left_adjust, top); --- 3203,3207 ---- long top(bounds.top); long left(bounds.left); ! extents_t rect; point_t position(left + left_adjust, top); *************** *** 3433,3440 **** /****************************************************************************************************/ ! rectangle_t popup_t::implementation_t::best_bounds() { assert(control_m); ! rectangle_t result; // // Make sure that metrics_t is initialized. --- 3433,3440 ---- /****************************************************************************************************/ ! extents_t popup_t::implementation_t::best_bounds() { assert(control_m); ! extents_t result; // // Make sure that metrics_t is initialized. *************** *** 3511,3515 **** if (have_border) baseline += border; } ! result.slice_m[rectangle_slices_t::vertical].poi_m.push_back(baseline); } else ADOBE_THROW_LAST_ERROR; // --- 3511,3515 ---- if (have_border) baseline += border; } ! result.slice_m[extents_slices_t::vertical].poi_m.push_back(baseline); } else ADOBE_THROW_LAST_ERROR; // *************** *** 3526,3532 **** // the widgets in set_bounds. // ! rectangle_t label_bounds = get_label().best_bounds(); static_height_m = label_bounds.height(); ! static_baseline_m = label_bounds.slice_m[rectangle_slices_t::vertical].poi_m[0]; // // Now we can align the label within the vertical --- 3526,3532 ---- // the widgets in set_bounds. // ! extents_t label_bounds = get_label().best_bounds(); static_height_m = label_bounds.height(); ! static_baseline_m = label_bounds.slice_m[extents_slices_t::vertical].poi_m[0]; // // Now we can align the label within the vertical *************** *** 3534,3538 **** // the label is shorter than the popup. // ! align_slices(result.slice_m[rectangle_slices_t::vertical], label_bounds.slice_m[rectangle_slices_t::vertical]); // // Add the width of the label (plus a gap) to the --- 3534,3538 ---- // the label is shorter than the popup. // ! align_slices(result.slice_m[extents_slices_t::vertical], label_bounds.slice_m[extents_slices_t::vertical]); // // Add the width of the label (plus a gap) to the *************** *** 3544,3548 **** // We put the label to the left of the popup. // ! result.slice_m[rectangle_slices_t::horizontal].poi_m.push_back(label_bounds.width()); return result;; } --- 3544,3548 ---- // We put the label to the left of the popup. // ! result.slice_m[extents_slices_t::horizontal].poi_m.push_back(label_bounds.width()); return result;; } *************** *** 3550,3554 **** /****************************************************************************************************/ ! void popup_t::implementation_t::set_bounds(const point_t& pos, const rectangle_t& geometry) { assert(control_m); --- 3550,3554 ---- /****************************************************************************************************/ ! void popup_t::implementation_t::set_bounds(const point_t& pos, const extents_t& geometry) { assert(control_m); *************** *** 3566,3571 **** // baseline - the label's baseline. // ! assert(!geometry_m.slice_m[rectangle_slices_t::vertical].poi_m.empty()); ! long baseline = geometry_m.slice_m[rectangle_slices_t::vertical].poi_m[0]; // // Apply the vertical offset. --- 3566,3571 ---- // baseline - the label's baseline. // ! assert(!geometry_m.slice_m[extents_slices_t::vertical].poi_m.empty()); ! long baseline = geometry_m.slice_m[extents_slices_t::vertical].poi_m[0]; // // Apply the vertical offset. *************** *** 3576,3582 **** // point of interest. // ! rectangle_t label_size; ! assert(!geometry_m.slice_m[rectangle_slices_t::horizontal].poi_m.empty()); ! label_size.width() = geometry_m.slice_m[rectangle_slices_t::horizontal].poi_m[0]; label_size.height() = static_height_m; // --- 3576,3582 ---- // point of interest. // ! extents_t label_size; ! assert(!geometry_m.slice_m[extents_slices_t::horizontal].poi_m.empty()); ! label_size.width() = geometry_m.slice_m[extents_slices_t::horizontal].poi_m[0]; label_size.height() = static_height_m; // *************** *** 3624,3628 **** long left(bounds.left); point_t position(left + left_adjust, top + top_adjust); ! rectangle_t rect; rect.height() = bounds.bottom - bounds.top; --- 3624,3628 ---- long left(bounds.left); point_t position(left + left_adjust, top + top_adjust); ! extents_t rect; rect.height() = bounds.bottom - bounds.top; *************** *** 3836,3843 **** /****************************************************************************************************/ ! rectangle_t unit_edit_text_t::implementation_t::best_bounds() { assert(control_m); ! rectangle_t result(_super::best_bounds()); // // Store the height of the edit widget in case the --- 3836,3843 ---- /****************************************************************************************************/ ! extents_t unit_edit_text_t::implementation_t::best_bounds() { assert(control_m); ! extents_t result(_super::best_bounds()); // // Store the height of the edit widget in case the *************** *** 3846,3850 **** // edit_height_m = result.height(); ! edit_baseline_m = result.slice_m[rectangle_slices_t::vertical].poi_m[0]; // // We need to discover the maximum size which we could --- 3846,3850 ---- // edit_height_m = result.height(); ! edit_baseline_m = result.slice_m[extents_slices_t::vertical].poi_m[0]; // // We need to discover the maximum size which we could *************** *** 3854,3859 **** if (using_popup_m) { ! rectangle_t popup_size = popup_m.best_bounds(); ! align_slices(result.slice_m[rectangle_slices_t::vertical], popup_size.slice_m[rectangle_slices_t::vertical]); // // We need to store a point of interest at the --- 3854,3859 ---- if (using_popup_m) { ! extents_t popup_size = popup_m.best_bounds(); ! align_slices(result.slice_m[extents_slices_t::vertical], popup_size.slice_m[extents_slices_t::vertical]); // // We need to store a point of interest at the *************** *** 3862,3866 **** // a gap). // ! result.slice_m[rectangle_slices_t::horizontal].poi_m.push_back(result.width()); result.width() += gap + popup_size.width(); // --- 3862,3866 ---- // a gap). // ! result.slice_m[extents_slices_t::horizontal].poi_m.push_back(result.width()); result.width() += gap + popup_size.width(); // *************** *** 3869,3873 **** // popup_height_m = popup_size.height(); ! popup_baseline_m = popup_size.slice_m[rectangle_slices_t::vertical].poi_m[0]; } return result; --- 3869,3873 ---- // popup_height_m = popup_size.height(); ! popup_baseline_m = popup_size.slice_m[extents_slices_t::vertical].poi_m[0]; } return result; *************** *** 3876,3888 **** /****************************************************************************************************/ ! void unit_edit_text_t::implementation_t::set_bounds(const point_t& pos, const rectangle_t& geometry) { assert(control_m); point_t position(pos); ! adobe::rectangle_t edit_geometry; ! adobe::rectangle_t copy_geometry(geometry); adobe::point_t edit_position(pos); ! long baseline(geometry.slice_m[rectangle_slices_t::vertical].poi_m[0]); // // If our edit widget has a label, then we need to put the --- 3876,3888 ---- /****************************************************************************************************/ ! void unit_edit_text_t::implementation_t::set_bounds(const point_t& pos, const extents_t& geometry) { assert(control_m); point_t position(pos); ! adobe::extents_t edit_geometry; ! adobe::extents_t copy_geometry(geometry); adobe::point_t edit_position(pos); ! long baseline(geometry.slice_m[extents_slices_t::vertical].poi_m[0]); // // If our edit widget has a label, then we need to put the *************** *** 3891,3900 **** // if (using_label_m) { ! edit_geometry.slice_m[rectangle_slices_t::horizontal].poi_m.push_back(copy_geometry.slice_m[rectangle_slices_t::horizontal].poi_m[0]); ! edit_geometry.slice_m[rectangle_slices_t::vertical].poi_m.push_back(edit_baseline_m); // // We don't need the edit's point of interest any more. // ! copy_geometry.slice_m[rectangle_slices_t::horizontal].poi_m.erase(copy_geometry.slice_m[rectangle_slices_t::horizontal].poi_m.begin()); } // --- 3891,3900 ---- // if (using_label_m) { ! edit_geometry.slice_m[extents_slices_t::horizontal].poi_m.push_back(copy_geometry.slice_m[extents_slices_t::horizontal].poi_m[0]); ! edit_geometry.slice_m[extents_slices_t::vertical].poi_m.push_back(edit_baseline_m); // // We don't need the edit's point of interest any more. // ! copy_geometry.slice_m[extents_slices_t::horizontal].poi_m.erase(copy_geometry.slice_m[extents_slices_t::horizontal].poi_m.begin()); } // *************** *** 3917,3925 **** // popup. // ! adobe::rectangle_t popup_geometry; adobe::point_t popup_position(pos); ! popup_geometry.width() = copy_geometry.slice_m[rectangle_slices_t::horizontal].length_m - ! copy_geometry.slice_m[rectangle_slices_t::horizontal].poi_m[0]; popup_geometry.height() = popup_height_m; // --- 3917,3925 ---- // popup. // ! adobe::extents_t popup_geometry; adobe::point_t popup_position(pos); ! popup_geometry.width() = copy_geometry.slice_m[extents_slices_t::horizontal].length_m - ! copy_geometry.slice_m[extents_slices_t::horizontal].poi_m[0]; popup_geometry.height() = popup_height_m; // *************** *** 4097,4103 **** /****************************************************************************************************/ ! rectangle_t slider_t::implementation_t::best_bounds() { ! rectangle_t result; // // Get the size of the thumb, and then multiply it by the number of tick --- 4097,4103 ---- /****************************************************************************************************/ ! extents_t slider_t::implementation_t::best_bounds() { ! extents_t result; // // Get the size of the thumb, and then multiply it by the number of tick *************** *** 4415,4419 **** /****************************************************************************************************/ ! void hitless_t::implementation_t::set_bounds(const point_t&, const rectangle_t&) { /* do nothing on Win for now */ --- 4415,4419 ---- /****************************************************************************************************/ ! void hitless_t::implementation_t::set_bounds(const point_t&, const extents_t&) { /* do nothing on Win for now */ *************** *** 4467,4471 **** #ifndef NDEBUG ! void frame_geometry(window_t& window, const point_t& position, const rectangle_t& geometry) { #if 0 --- 4467,4471 ---- #ifndef NDEBUG ! void frame_geometry(window_t& window, const point_t& position, const extents_t& geometry) { #if 0 *************** *** 4500,4505 **** { ! points_of_interest_t::const_iterator iter(geometry.slice_m[rectangle_slices_t::horizontal].poi_m.begin()); ! points_of_interest_t::const_iterator last(geometry.slice_m[rectangle_slices_t::horizontal].poi_m.end()); for (; iter != last; ++iter) { --- 4500,4505 ---- { ! points_of_interest_t::const_iterator iter(geometry.slice_m[extents_slices_t::horizontal].poi_m.begin()); ! points_of_interest_t::const_iterator last(geometry.slice_m[extents_slices_t::horizontal].poi_m.end()); for (; iter != last; ++iter) { *************** *** 4515,4520 **** { ! points_of_interest_t::const_iterator iter(geometry.slice_m[rectangle_slices_t::vertical].poi_m.begin()); ! points_of_interest_t::const_iterator last(geometry.slice_m[rectangle_slices_t::vertical].poi_m.end()); for (; iter != last; ++iter) { --- 4515,4520 ---- { ! points_of_interest_t::const_iterator iter(geometry.slice_m[extents_slices_t::vertical].poi_m.begin()); ! points_of_interest_t::const_iterator last(geometry.slice_m[extents_slices_t::vertical].poi_m.end()); for (; iter != last; ++iter) { |
|
From: Foster B. <fos...@us...> - 2005-04-19 17:56:02
|
Update of /cvsroot/adobe-source/sandbox/visual_refactor/adobe/documentation/sources/asl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32418/adobe/documentation/sources/asl Added Files: extents_t.dox Removed Files: rectangle_t.dox Log Message: rectangle now extents; started work on the ui_core, client_assembler API cleanup --- NEW FILE: extents_t.dox --- //***************************************************************************// //***************************************************************************// //***************************************************************************// /*! \class adobe::rectangle_t rectangle.hpp <adobe/rectangle.hpp> \ingroup asl_libraries \brief An intrinsic geometry class for objects with a graphical representation. rectangle_t is a totally ordered class for storing intrinsic geometry about a graphical element. Each rectangle_t is comprised of two slices. A slice stores intrinsic geometry about a graphical element for in a single direction, either vertically or horizontally. \model_of - \ref concept_regular_type \rationale rectangle_t is intended to describe only the properties of a graphical element which it retains intrinsically. Properties that involve an element as it relates to another element (like position) should not be described here. This is intended to separate the notions of intrinsic versus extrinsic values. This seems strange at first, but is justified when considering how to make a copy of an element's geometry: the copy will not have the same relationships as the original, so extrinsic values cannot be copied, nor can they be set to default values because there is no relationship to which they relate. Any extrinsic value in that case is equally meaningless. \todo (fbrereto) We need a better name than rectangle_t \todo (fbrereto) We need a better name than points_of_interest_t */ /*! \var boost::array<adobe::rectangle_t::slice_t, 2> adobe::rectangle_t::slice_m The two slices that comprise this rectangle. */ /*! \fn long& adobe::rectangle_t::height() \return a reference to length_m in the vertical slice. */ /*! \fn long& adobe::rectangle_t::width() \return a reference to length_m in the horizontal slice. */ /*! \fn const long& adobe::rectangle_t::height() const \return a reference to length_m in the vertical slice. */ /*! \fn const long& adobe::rectangle_t::width() const \return a reference to length_m in the horizontal slice. */ //***************************************************************************// //***************************************************************************// //***************************************************************************// /*! \class adobe::rectangle_slices_t rectangle.hpp <adobe/rectangle.hpp> \ingroup asl_libraries \brief A utility class for referencing the two slices of a rectangle_t. */ /*! \var adobe::rectangle_slices_t::horizontal An index used to reference the horizontal rectangle_t::slice_t in a rectangle_t. */ /*! \var adobe::rectangle_slices_t::vertical An index used to reference the vertical rectangle_t::slice_t in a rectangle_t. */ //***************************************************************************// //***************************************************************************// //***************************************************************************// /*! \class adobe::rectangle_t::slice_t rectangle.hpp <adobe/rectangle.hpp> \ingroup asl_libraries \brief A class containing element geometry for a single orientation. \par Model Of: Regular Type \par Rationale adobe::rectangle_t::slice_t is intended to make iterating over a rectangle easier. If the notion of orientation is abstracted out when manipulating geometries, it is possible to loop once over a series of rectangles in one direction, then again in the other. More code can be shared at that point, no matter which way you slice it. */ /*! \fn adobe::rectangle_t::slice_t::slice_t Default constructor. */ /*! \var long adobe::rectangle_t::slice_t::length_m The length of this slice. */ /*! \var pair_long_t adobe::rectangle_t::slice_t::outset_m Outset describes the amount outside the bounds of the element taken up by a graphic that can be absorbed by spacing. An example of this would be the drop shadow around a window. This value is a hither/yon pair, meaning the values represent the values on either side of the element being described for this orientation. */ /*! \var pair_long_t adobe::rectangle_t::slice_t::frame_m Frame describes the amount inside the bounds of the element taken up by a graphic that cannot be absorbed by spacing. This value is a hither/yon pair, meaning the values represent the values on either side of the element being described for this orientation. */ /*! \var pair_long_t adobe::rectangle_t::slice_t::inset_m Inset describes the amount inside the bounds of the element taken up by a graphic that can be absorbed by spacing. This value is a hither/yon pair, meaning the values represent the values on either side of the element being described for this orientation. */ /*! \var points_of_interest_t adobe::rectangle_t::slice_t::poi_m The points of interest for a slice are simply a vector of values relating to points inside the element that might be of some value to objects outside the element. Examples of these are baseline values, colon-alignment values, and the widths of subparts of the graphical element. Note that points of interest are intended to be snapped together - that is, the size of the element is able to grow and shrink so the points of interest between two related elements are the same for a given orientation. For example, a horizontal point of interest like the colon-point of an edit text field will be snapped to other edit text fields to which it relates so as to achieve colon alignment. Depending on implementation, this could affect this slice's length. */ --- rectangle_t.dox DELETED --- |
|
From: Foster B. <fos...@us...> - 2005-04-19 12:53:14
|
Update of /cvsroot/adobe-source/sandbox/visual_refactor/adobe/test/visual/resources In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2662/visual_refactor/adobe/test/visual/resources Modified Files: aqua_button.ico Log Message: setting admin -kb for binary file Index: aqua_button.ico =================================================================== RCS file: /cvsroot/adobe-source/sandbox/visual_refactor/adobe/test/visual/resources/aqua_button.ico,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 Binary files /tmp/cvsTra1cS and /tmp/cvsLUo7KJ differ |
