homogeneous API change

SVN revision: 79528
This commit is contained in:
Andreas Volz 2012-11-21 22:20:44 +00:00
parent cd4ad54299
commit 19661e0ad5
19 changed files with 59 additions and 59 deletions

View File

@ -128,7 +128,7 @@ int main (int argc, char **argv)
}
bg->setWeightHintSize (1.0, 1.0);
elmWin->addObjectResize (*bg);
elmWin->addResizeObject (*bg);
/* set size hints. a minimum size for the bg. this should propagate back
* to the window thus limiting its size based off the bg as the bg is one

View File

@ -122,7 +122,7 @@ int main (int argc, char **argv)
/* tell the window that this object is to be resized along with the window.
* also as a result this object will be one of several objects that
* controls the minimum/maximum size of the window */
win->addObjectResize (*bg);
win->addResizeObject (*bg);
/* and show the background */
bg->show ();
@ -132,7 +132,7 @@ int main (int argc, char **argv)
bx0->setSizeHintWeight (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
/* tell the window that the box affects window size and also will be
* resized when the window is */
win->addObjectResize (*bx0);
win->addResizeObject (*bx0);
bx0->show ();
Frame *fr = Frame::factory (*win);

View File

@ -11,7 +11,7 @@ void test_bg_plain (void *data, Evas_Object *obj, void *event_info)
Background *bg = Background::factory (*win);
/* allow bg to expand in x & y */
bg->setSizeHintWeight (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
win->addObjectResize (*bg);
win->addResizeObject (*bg);
bg->show ();
/* set size hints. a minimum size for the bg. this should propagate back
@ -38,7 +38,7 @@ void test_bg_image (void *data, Evas_Object *obj, void *event_info)
Background *bg = Background::factory (*win);
bg->setFile (searchPixmapFile ("elementaryxx/plant_01.jpg"));
bg->setSizeHintWeight (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
win->addObjectResize (*bg);
win->addResizeObject (*bg);
bg->show ();
bg->setSizeHintMin (size160x160);

View File

@ -9,12 +9,12 @@ void test_box_vert (void *data, Evas_Object *obj, void *event_info)
win->setAutoDel (true);
Background *bg = Background::factory (*win);
win->addObjectResize (*bg);
win->addResizeObject (*bg);
bg->setSizeHintWeight (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
bg->show ();
Box *bx = Box::factory (*win);
win->addObjectResize (*bx);
win->addResizeObject (*bx);
bx->setSizeHintWeight (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
bx->show ();
@ -49,13 +49,13 @@ void test_box_horiz (void *data, Evas_Object *obj, void *event_info)
win->setAutoDel (true);
Background *bg = Background::factory (*win);
win->addObjectResize (*bg);
win->addResizeObject (*bg);
bg->setSizeHintWeight (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
bg->show ();
Box *bx = Box::factory (*win);
bx->setOrientation (Box::Horizontal);
win->addObjectResize (*bx);
win->addResizeObject (*bx);
bx->setSizeHintWeight (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
bx->show ();

View File

@ -10,12 +10,12 @@ void test_button (void *data, Evas_Object *obj, void *event_info)
win->setAutoDel (true);
Background *bg = Background::factory (*win);
win->addObjectResize (*bg);
win->addResizeObject (*bg);
bg->setSizeHintWeight (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
bg->show ();
Box *bx = Box::factory (*win);
win->addObjectResize (*bx);
win->addResizeObject (*bx);
bx->setSizeHintWeight (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
bx->show ();

View File

@ -10,12 +10,12 @@ void test_check (void *data, Evas_Object *obj, void *event_info)
win->setAutoDel (true);
Background *bg = Background::factory (*win);
win->addObjectResize (*bg);
win->addResizeObject (*bg);
bg->setSizeHintWeight (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
bg->show ();
Box *bx = Box::factory (*win);
win->addObjectResize (*bx);
win->addResizeObject (*bx);
bx->setSizeHintWeight (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
bx->show ();

View File

@ -7,12 +7,12 @@ void test_clock (void *data, Evas_Object *obj, void *event_info)
win->setAutoDel (true);
Background *bg = Background::factory (*win);
win->addObjectResize (*bg);
win->addResizeObject (*bg);
bg->setSizeHintWeight (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
bg->show ();
Box *bx = Box::factory (*win);
win->addObjectResize (*bx);
win->addResizeObject (*bx);
bx->setSizeHintWeight (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
bx->show ();

View File

@ -31,13 +31,13 @@ void test_entry (void *data, Evas_Object *obj, void *event_info)
win->setAutoDel (true);
Background *bg = Background::factory (*win);
win->addObjectResize (*bg);
win->addResizeObject (*bg);
bg->setSizeHintWeight (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
bg->show ();
Box *bx = Box::factory (*win);
bx->setSizeHintWeight (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
win->addObjectResize (*bx);
win->addResizeObject (*bx);
bx->show ();
Entry *en = Entry::factory (*win);
@ -110,13 +110,13 @@ void test_entry_scolled (void *data, Evas_Object *obj, void *event_info)
win->setAutoDel (true);
Background *bg = Background::factory (*win);
win->addObjectResize (*bg);
win->addResizeObject (*bg);
bg->setSizeHintWeight (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
bg->show ();
Box *bx = Box::factory (*win);
bx->setSizeHintWeight (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
win->addObjectResize (*bx);
win->addResizeObject (*bx);
bx->show ();
sc = Scroller::factory (*win);

View File

@ -137,13 +137,13 @@ void test_genlist (void *data, Evas_Object *obj, void *event_info)
win->setAutoDel (true);
Background *bg = Background::factory (*win);
win->addObjectResize (*bg);
win->addResizeObject (*bg);
bg->setSizeHintWeight (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
bg->show ();
Box *bx = Box::factory (*win);
bx->setSizeHintWeight (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
win->addObjectResize (*bx);
win->addResizeObject (*bx);
bx->show ();
GenList *gl = GenList::factory (*win);
@ -166,7 +166,7 @@ void test_genlist (void *data, Evas_Object *obj, void *event_info)
over->setEventsRepeat (true);
over->show ();
over->setSizeHintWeight (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
win->addObjectResize (*over);
win->addResizeObject (*over);
Button *bt_50 = Button::factory (*win);
bt_50->setText ("Go to 50");
@ -363,14 +363,14 @@ test_genlist2(void *data, Evas_Object *obj, void *event_info)
win->setAutoDel (true);
Background *bg = Background::factory (*win);
win->addObjectResize (*bg);
win->addResizeObject (*bg);
bg->setFile (searchPixmapFile ("elementaryxx/plant_01.jpg"));
bg->setSizeHintWeight (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
bg->show ();
Box *bx = Box::factory (*win);
bx->setSizeHintWeight (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
win->addObjectResize (*bx);
win->addResizeObject (*bx);
bx->show ();
GenList *gl = GenList::factory (*win);
@ -430,7 +430,7 @@ test_genlist2(void *data, Evas_Object *obj, void *event_info)
bx2 = Box::factory (*win);
bx2->setOrientation (Box::Horizontal);
bx2->setHomogenous (true);
bx2->setHomogeneous (true);
bx2->setSizeHintWeight (EVAS_HINT_EXPAND, 0.0);
bx2->setSizeHintAlign (EVAS_HINT_FILL, EVAS_HINT_FILL);
bx2->show ();
@ -472,7 +472,7 @@ test_genlist2(void *data, Evas_Object *obj, void *event_info)
bx2 = Box::factory (*win);
bx2->setOrientation (Box::Horizontal);
bx2->setHomogenous (true);
bx2->setHomogeneous (true);
bx2->setSizeHintWeight (EVAS_HINT_EXPAND, 0.0);
bx2->setSizeHintAlign (EVAS_HINT_FILL, EVAS_HINT_FILL);
bx2->show ();
@ -506,7 +506,7 @@ test_genlist2(void *data, Evas_Object *obj, void *event_info)
Box *bx3 = Box::factory (*win);
bx3->setOrientation (Box::Horizontal);
bx3->setHomogenous (true);
bx3->setHomogeneous (true);
bx3->setSizeHintWeight (EVAS_HINT_EXPAND, 0.0);
bx3->setSizeHintAlign (EVAS_HINT_FILL, EVAS_HINT_FILL);
@ -660,13 +660,13 @@ void test_genlist3(void *data, Evas_Object *obj, void *event_info)
win->setAutoDel (true);
Background *bg = Background::factory (*win);
win->addObjectResize (*bg);
win->addResizeObject (*bg);
bg->setSizeHintWeight (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
bg->show ();
Box *bx = Box::factory (*win);
bx->setSizeHintWeight (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
win->addObjectResize (*bx);
win->addResizeObject (*bx);
bx->show ();
GenList *gl = GenList::factory (*win);
@ -702,7 +702,7 @@ void test_genlist3(void *data, Evas_Object *obj, void *event_info)
bx2 = Box::factory (*win);
bx2->setOrientation (Box::Horizontal);
bx2->setHomogenous (true);
bx2->setHomogeneous (true);
bx2->setSizeHintWeight (EVAS_HINT_EXPAND, 0.0);
bx2->setSizeHintAlign (EVAS_HINT_FILL, EVAS_HINT_FILL);
@ -812,13 +812,13 @@ void test_genlist4 (void *data, Evas_Object *obj, void *event_info)
win->setAutoDel (true);
Background *bg = Background::factory (*win);
win->addObjectResize (*bg);
win->addResizeObject (*bg);
bg->setSizeHintWeight (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
bg->show ();
Box *bx = Box::factory (*win);
bx->setSizeHintWeight (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
win->addObjectResize (*bx);
win->addResizeObject (*bx);
GenList *gl = GenList::factory (*win);
gl->setSizeHintAlign (EVAS_HINT_FILL, EVAS_HINT_FILL);
@ -850,7 +850,7 @@ void test_genlist4 (void *data, Evas_Object *obj, void *event_info)
bx2 = Box::factory (*win);
bx2->setOrientation (Box::Horizontal);
bx2->setHomogenous (true);
bx2->setHomogeneous (true);
bx2->setSizeHintWeight (EVAS_HINT_EXPAND, 0.0);
bx2->setSizeHintAlign (EVAS_HINT_FILL, EVAS_HINT_FILL);
@ -1008,13 +1008,13 @@ void test_genlist5 (void *data, Evas_Object *obj, void *event_info)
win->setAutoDel (true);
Background *bg = Background::factory (*win);
win->addObjectResize (*bg);
win->addResizeObject (*bg);
bg->setSizeHintWeight (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
bg->show ();
Box *bx = Box::factory (*win);
bx->setSizeHintWeight (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
win->addObjectResize (*bx);
win->addResizeObject (*bx);
bx->show ();
GenList *gl = GenList::factory (*win);
@ -1061,7 +1061,7 @@ void test_genlist5 (void *data, Evas_Object *obj, void *event_info)
bx2 = Box::factory (*win);
bx2->setOrientation (Box::Horizontal);
bx2->setHomogenous (true);
bx2->setHomogeneous (true);
bx2->setSizeHintWeight (EVAS_HINT_EXPAND, 0.0);
bx2->setSizeHintAlign (EVAS_HINT_FILL, EVAS_HINT_FILL);
@ -1193,13 +1193,13 @@ void test_genlist6(void *data, Evas_Object *obj, void *event_info)
win->setAutoDel (true);
Background *bg = Background::factory (*win);
win->addObjectResize (*bg);
win->addResizeObject (*bg);
bg->setSizeHintWeight (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
bg->show ();
Box *bx = Box::factory (*win);
bx->setSizeHintWeight (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
win->addObjectResize (*bx);
win->addResizeObject (*bx);
bx->show ();
GenList *gl = GenList::factory (*win);
@ -1233,7 +1233,7 @@ void test_genlist6(void *data, Evas_Object *obj, void *event_info)
bx2 = Box::factory (*win);
bx2->setOrientation (Box::Horizontal);
bx2->setHomogenous (true);
bx2->setHomogeneous (true);
bx2->setSizeHintWeight (EVAS_HINT_EXPAND, 0.0);
bx2->setSizeHintAlign (EVAS_HINT_FILL, EVAS_HINT_FILL);

View File

@ -17,13 +17,13 @@ void test_hover (void *data, Evas_Object *obj, void *event_info)
win->setAutoDel (true);
Background *bg = Background::factory (*win);
win->addObjectResize (*bg);
win->addResizeObject (*bg);
bg->setSizeHintWeight (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
bg->show ();
bx = Box::factory (*win);
bx->setSizeHintWeight (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
win->addObjectResize (*bx);
win->addResizeObject (*bx);
bx->show ();
Hover *hv = Hover::factory (*win);
@ -99,13 +99,13 @@ void test_hover2 (void *data, Evas_Object *obj, void *event_info)
win->setAutoDel (true);
Background *bg = Background::factory (*win);
win->addObjectResize (*bg);
win->addResizeObject (*bg);
bg->setSizeHintWeight (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
bg->show ();
bx = Box::factory (*win);
bx->setSizeHintWeight (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
win->addObjectResize (*bx);
win->addResizeObject (*bx);
bx->show ();
Hover *hv = Hover::factory (*win);

View File

@ -17,7 +17,7 @@ void test_icon (void *data, Evas_Object *obj, void *event_info)
Icon *ic = Icon::factory (*win);
ic->setFile (searchPixmapFile ("elementaryxx/logo.png"));
ic->setNoScale (true);
win->addObjectResize (*ic);
win->addResizeObject (*ic);
ic->show ();
ic->getEventSignal ("clicked")->connect (sigc::ptr_fun (&icon_clicked));

View File

@ -9,14 +9,14 @@ void test_layout (void *data, Evas_Object *obj, void *event_info)
win->setAutoDel (true);
Background *bg = Background::factory (*win);
win->addObjectResize (*bg);
win->addResizeObject (*bg);
bg->setSizeHintWeight (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
bg->show ();
Layout *ly = Layout::factory (*win);
ly->setFile (searchEdjeFile ("elementaryxx-test.edj"), "layout");
ly->setSizeHintWeight (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
win->addObjectResize (*ly);
win->addResizeObject (*ly);
ly->show ();
Button *bt = Button::factory (*win);

View File

@ -82,13 +82,13 @@ void test_panel (void *data, Evas_Object *obj, void *event_info)
win->setAutoDel (true);
Background *bg = Background::factory (*win);
win->addObjectResize (*bg);
win->addResizeObject (*bg);
bg->setSizeHintWeight (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
bg->show ();
Box *bx = Box::factory (*win);
bx->setSizeHintWeight (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
win->addObjectResize (*bx);
win->addResizeObject (*bx);
bx->show ();
Panel *panel = Panel::factory (*win);

View File

@ -101,12 +101,12 @@ void test_progressbar(void *data, Evas_Object *obj, void *event_info)
win->getEventSignal ("delete,request")->connect (sigc::ptr_fun (&my_progressbar_destroy));
Background *bg = Background::factory (*win);
win->addObjectResize (*bg);
win->addResizeObject (*bg);
bg->setSizeHintWeight (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
bg->show ();
Box *bx = Box::factory (*win);
win->addObjectResize (*bx);
win->addResizeObject (*bx);
bx->setSizeHintWeight (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
bx->show ();

View File

@ -11,12 +11,12 @@ void test_radio (void *data, Evas_Object *obj, void *event_info)
win->setAutoDel (true);
Background *bg = Background::factory (*win);
win->addObjectResize (*bg);
win->addResizeObject (*bg);
bg->setSizeHintWeight (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
bg->show ();
Box *bx = Box::factory (*win);
win->addObjectResize (*bx);
win->addResizeObject (*bx);
bx->setSizeHintWeight (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
bx->show ();

View File

@ -10,12 +10,12 @@ void test_slider (void *data, Evas_Object *obj, void *event_info)
win->setAutoDel (true);
Background *bg = Background::factory (*win);
win->addObjectResize (*bg);
win->addResizeObject (*bg);
bg->setSizeHintWeight (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
bg->show ();
Box *bx = Box::factory (*win);
win->addObjectResize (*bx);
win->addResizeObject (*bx);
bx->setSizeHintWeight (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
bx->show ();

View File

@ -9,13 +9,13 @@ void test_spinner(void *data, Evas_Object *obj, void *event_info)
win->setAutoDel (true);
Background *bg = Background::factory (*win);
win->addObjectResize (*bg);
win->addResizeObject (*bg);
bg->setSizeHintWeight (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
bg->show ();
Box *bx = Box::factory (*win);
bx->setSizeHintWeight (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
win->addObjectResize (*bx);
win->addResizeObject (*bx);
bx->show ();
sp = Spinner::factory (*win);

View File

@ -9,12 +9,12 @@ void test_table (void *data, Evas_Object *obj, void *event_info)
win->setAutoDel (true);
Background *bg = Background::factory (*win);
win->addObjectResize (*bg);
win->addResizeObject (*bg);
bg->setSizeHintWeight (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
bg->show ();
Table *tb = Table::factory (*win);
win->addObjectResize (*tb);
win->addResizeObject (*tb);
tb->setSizeHintWeight (EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
tb->show ();

View File

@ -49,7 +49,7 @@ int main (int argc, char **argv)
Slider *elmSlider = Slider::factory (*elmWin);
bg->setSizeHintWeight (1.0, 1.0);
elmWin->addObjectResize (*bg);
elmWin->addResizeObject (*bg);
/* set size hints. a minimum size for the bg. this should propagate back
* to the window thus limiting its size based off the bg as the bg is one