Changeset 266ec54 in mainline for uspace/lib/ui/test/wdecor.c


Ignore:
Timestamp:
2020-11-28T23:06:31Z (5 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
db3c6795
Parents:
554a5f1
git-author:
Jiri Svoboda <jiri@…> (2020-11-27 22:30:28)
git-committer:
Jiri Svoboda <jiri@…> (2020-11-28 23:06:31)
Message:

Viewer fullsreen mode

Fullscreen window placement is more of a stopgap. Proper
solution would probably be via maximizing the window.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/lib/ui/test/wdecor.c

    r554a5f1 r266ec54  
    360360        errno_t rc;
    361361
    362         rc = ui_wdecor_create(NULL, "Hello", ui_wds_none, &wdecor);
     362        rc = ui_wdecor_create(NULL, "Hello", ui_wds_decorated, &wdecor);
    363363        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
    364364
     
    388388}
    389389
    390 /** ui_wdecor_get_geom() produces the correct geometry */
    391 PCUT_TEST(get_geom)
     390/** ui_wdecor_get_geom() with ui_wds_none produces the correct geometry */
     391PCUT_TEST(get_geom_none)
    392392{
    393393        ui_wdecor_t *wdecor;
     
    407407        ui_wdecor_get_geom(wdecor, &geom);
    408408
     409        PCUT_ASSERT_INT_EQUALS(10, geom.interior_rect.p0.x);
     410        PCUT_ASSERT_INT_EQUALS(20, geom.interior_rect.p0.y);
     411        PCUT_ASSERT_INT_EQUALS(100, geom.interior_rect.p1.x);
     412        PCUT_ASSERT_INT_EQUALS(200, geom.interior_rect.p1.y);
     413
     414        PCUT_ASSERT_INT_EQUALS(0, geom.title_bar_rect.p0.x);
     415        PCUT_ASSERT_INT_EQUALS(0, geom.title_bar_rect.p0.y);
     416        PCUT_ASSERT_INT_EQUALS(0, geom.title_bar_rect.p1.x);
     417        PCUT_ASSERT_INT_EQUALS(0, geom.title_bar_rect.p1.y);
     418
     419        PCUT_ASSERT_INT_EQUALS(0, geom.btn_close_rect.p0.x);
     420        PCUT_ASSERT_INT_EQUALS(0, geom.btn_close_rect.p0.y);
     421        PCUT_ASSERT_INT_EQUALS(0, geom.btn_close_rect.p1.x);
     422        PCUT_ASSERT_INT_EQUALS(0, geom.btn_close_rect.p1.y);
     423
     424        PCUT_ASSERT_INT_EQUALS(10, geom.app_area_rect.p0.x);
     425        PCUT_ASSERT_INT_EQUALS(20, geom.app_area_rect.p0.y);
     426        PCUT_ASSERT_INT_EQUALS(100, geom.app_area_rect.p1.x);
     427        PCUT_ASSERT_INT_EQUALS(200, geom.app_area_rect.p1.y);
     428
     429        ui_wdecor_destroy(wdecor);
     430}
     431
     432/** ui_wdecor_get_geom() with ui_wds_frame produces the correct geometry */
     433PCUT_TEST(get_geom_frame)
     434{
     435        ui_wdecor_t *wdecor;
     436        gfx_rect_t rect;
     437        ui_wdecor_geom_t geom;
     438        errno_t rc;
     439
     440        rc = ui_wdecor_create(NULL, "Hello", ui_wds_frame, &wdecor);
     441        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
     442
     443        rect.p0.x = 10;
     444        rect.p0.y = 20;
     445        rect.p1.x = 100;
     446        rect.p1.y = 200;
     447
     448        ui_wdecor_set_rect(wdecor, &rect);
     449        ui_wdecor_get_geom(wdecor, &geom);
     450
    409451        PCUT_ASSERT_INT_EQUALS(14, geom.interior_rect.p0.x);
    410452        PCUT_ASSERT_INT_EQUALS(24, geom.interior_rect.p0.y);
     
    412454        PCUT_ASSERT_INT_EQUALS(196, geom.interior_rect.p1.y);
    413455
     456        PCUT_ASSERT_INT_EQUALS(0, geom.title_bar_rect.p0.x);
     457        PCUT_ASSERT_INT_EQUALS(0, geom.title_bar_rect.p0.y);
     458        PCUT_ASSERT_INT_EQUALS(0, geom.title_bar_rect.p1.x);
     459        PCUT_ASSERT_INT_EQUALS(0, geom.title_bar_rect.p1.y);
     460
     461        PCUT_ASSERT_INT_EQUALS(0, geom.btn_close_rect.p0.x);
     462        PCUT_ASSERT_INT_EQUALS(0, geom.btn_close_rect.p0.y);
     463        PCUT_ASSERT_INT_EQUALS(0, geom.btn_close_rect.p1.x);
     464        PCUT_ASSERT_INT_EQUALS(0, geom.btn_close_rect.p1.y);
     465
     466        PCUT_ASSERT_INT_EQUALS(14, geom.app_area_rect.p0.x);
     467        PCUT_ASSERT_INT_EQUALS(24, geom.app_area_rect.p0.y);
     468        PCUT_ASSERT_INT_EQUALS(96, geom.app_area_rect.p1.x);
     469        PCUT_ASSERT_INT_EQUALS(196, geom.app_area_rect.p1.y);
     470
     471        ui_wdecor_destroy(wdecor);
     472}
     473
     474/** ui_wdecor_get_geom() with ui_wds_frame | ui_wds_titlebar */
     475PCUT_TEST(get_geom_frame_titlebar)
     476{
     477        ui_wdecor_t *wdecor;
     478        gfx_rect_t rect;
     479        ui_wdecor_geom_t geom;
     480        errno_t rc;
     481
     482        rc = ui_wdecor_create(NULL, "Hello", ui_wds_frame | ui_wds_titlebar,
     483            &wdecor);
     484        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
     485
     486        rect.p0.x = 10;
     487        rect.p0.y = 20;
     488        rect.p1.x = 100;
     489        rect.p1.y = 200;
     490
     491        ui_wdecor_set_rect(wdecor, &rect);
     492        ui_wdecor_get_geom(wdecor, &geom);
     493
     494        PCUT_ASSERT_INT_EQUALS(14, geom.interior_rect.p0.x);
     495        PCUT_ASSERT_INT_EQUALS(24, geom.interior_rect.p0.y);
     496        PCUT_ASSERT_INT_EQUALS(96, geom.interior_rect.p1.x);
     497        PCUT_ASSERT_INT_EQUALS(196, geom.interior_rect.p1.y);
     498
    414499        PCUT_ASSERT_INT_EQUALS(14, geom.title_bar_rect.p0.x);
    415500        PCUT_ASSERT_INT_EQUALS(24, geom.title_bar_rect.p0.y);
     
    417502        PCUT_ASSERT_INT_EQUALS(46, geom.title_bar_rect.p1.y);
    418503
     504        PCUT_ASSERT_INT_EQUALS(0, geom.btn_close_rect.p0.x);
     505        PCUT_ASSERT_INT_EQUALS(0, geom.btn_close_rect.p0.y);
     506        PCUT_ASSERT_INT_EQUALS(0, geom.btn_close_rect.p1.x);
     507        PCUT_ASSERT_INT_EQUALS(0, geom.btn_close_rect.p1.y);
     508
     509        PCUT_ASSERT_INT_EQUALS(14, geom.app_area_rect.p0.x);
     510        PCUT_ASSERT_INT_EQUALS(46, geom.app_area_rect.p0.y);
     511        PCUT_ASSERT_INT_EQUALS(96, geom.app_area_rect.p1.x);
     512        PCUT_ASSERT_INT_EQUALS(196, geom.app_area_rect.p1.y);
     513
     514        ui_wdecor_destroy(wdecor);
     515}
     516
     517/** ui_wdecor_get_geom() with ui_wds_decorated produces the correct geometry */
     518PCUT_TEST(get_geom_decorated)
     519{
     520        ui_wdecor_t *wdecor;
     521        gfx_rect_t rect;
     522        ui_wdecor_geom_t geom;
     523        errno_t rc;
     524
     525        rc = ui_wdecor_create(NULL, "Hello", ui_wds_decorated, &wdecor);
     526        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
     527
     528        rect.p0.x = 10;
     529        rect.p0.y = 20;
     530        rect.p1.x = 100;
     531        rect.p1.y = 200;
     532
     533        ui_wdecor_set_rect(wdecor, &rect);
     534        ui_wdecor_get_geom(wdecor, &geom);
     535
     536        PCUT_ASSERT_INT_EQUALS(14, geom.interior_rect.p0.x);
     537        PCUT_ASSERT_INT_EQUALS(24, geom.interior_rect.p0.y);
     538        PCUT_ASSERT_INT_EQUALS(96, geom.interior_rect.p1.x);
     539        PCUT_ASSERT_INT_EQUALS(196, geom.interior_rect.p1.y);
     540
     541        PCUT_ASSERT_INT_EQUALS(14, geom.title_bar_rect.p0.x);
     542        PCUT_ASSERT_INT_EQUALS(24, geom.title_bar_rect.p0.y);
     543        PCUT_ASSERT_INT_EQUALS(96, geom.title_bar_rect.p1.x);
     544        PCUT_ASSERT_INT_EQUALS(46, geom.title_bar_rect.p1.y);
     545
    419546        PCUT_ASSERT_INT_EQUALS(75, geom.btn_close_rect.p0.x);
    420547        PCUT_ASSERT_INT_EQUALS(25, geom.btn_close_rect.p0.y);
     
    441568        arect.p1.y = 196;
    442569
    443         ui_wdecor_rect_from_app(&arect, &rect);
     570        ui_wdecor_rect_from_app(ui_wds_none, &arect, &rect);
     571
     572        PCUT_ASSERT_INT_EQUALS(14, rect.p0.x);
     573        PCUT_ASSERT_INT_EQUALS(46, rect.p0.y);
     574        PCUT_ASSERT_INT_EQUALS(96, rect.p1.x);
     575        PCUT_ASSERT_INT_EQUALS(196, rect.p1.y);
     576
     577        ui_wdecor_rect_from_app(ui_wds_frame, &arect, &rect);
     578
     579        PCUT_ASSERT_INT_EQUALS(10, rect.p0.x);
     580        PCUT_ASSERT_INT_EQUALS(42, rect.p0.y);
     581        PCUT_ASSERT_INT_EQUALS(100, rect.p1.x);
     582        PCUT_ASSERT_INT_EQUALS(200, rect.p1.y);
     583
     584        ui_wdecor_rect_from_app(ui_wds_decorated, &arect, &rect);
    444585
    445586        PCUT_ASSERT_INT_EQUALS(10, rect.p0.x);
     
    447588        PCUT_ASSERT_INT_EQUALS(100, rect.p1.x);
    448589        PCUT_ASSERT_INT_EQUALS(200, rect.p1.y);
     590
    449591}
    450592
Note: See TracChangeset for help on using the changeset viewer.