|
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 defi... [truncated message content] |