Changeset 19b3cc6 in mainline for uspace/app/vdemo/vdemo.c
- Timestamp:
- 2014-01-17T23:12:10Z (11 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- e26a9d95
- Parents:
- fddffb2 (diff), facc34d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the(diff)
links above to see all the changes relative to each parent. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/app/vdemo/vdemo.c
rfddffb2 r19b3cc6 110 110 { 111 111 if (argc >= 2) { 112 window_t *main_window = window_open(argv[1], true, true, "vdemo" , 0, 0);112 window_t *main_window = window_open(argv[1], true, true, "vdemo"); 113 113 if (!main_window) { 114 114 printf("Cannot open main window.\n"); … … 117 117 118 118 pixel_t grd_bg = PIXEL(255, 240, 240, 240); 119 pixel_t btn_bg = PIXEL(255, 0, 0, 0); 120 pixel_t btn_fg = PIXEL(255, 240, 240, 240); 119 120 pixel_t btn_bg = PIXEL(255, 240, 240, 240); 121 pixel_t btn_fg = PIXEL(255, 186, 186, 186); 122 pixel_t btn_text = PIXEL(255, 0, 0, 0); 123 121 124 pixel_t lbl_bg = PIXEL(255, 240, 240, 240); 122 pixel_t lbl_ fg= PIXEL(255, 0, 0, 0);125 pixel_t lbl_text = PIXEL(255, 0, 0, 0); 123 126 124 my_label_t *lbl_action = create_my_label(NULL, "Hello there!", 16, lbl_bg, lbl_fg); 125 button_t *btn_confirm = create_button(NULL, "Confirm", 16, btn_bg, btn_fg); 126 button_t *btn_cancel = create_button(NULL, "Cancel", 16, btn_bg, btn_fg); 127 my_label_t *lbl_action = create_my_label(NULL, "Hello there!", 16, 128 lbl_bg, lbl_text); 129 button_t *btn_confirm = create_button(NULL, "Confirm", 16, btn_bg, 130 btn_fg, btn_text); 131 button_t *btn_cancel = create_button(NULL, "Cancel", 16, btn_bg, 132 btn_fg, btn_text); 127 133 grid_t *grid = create_grid(window_root(main_window), 2, 2, grd_bg); 128 134 if (!lbl_action || !btn_confirm || !btn_cancel || !grid) { … … 144 150 grid->add(grid, &btn_confirm->widget, 0, 1, 1, 1); 145 151 grid->add(grid, &btn_cancel->widget, 1, 1, 1, 1); 146 window_resize(main_window, 200, 76); 152 window_resize(main_window, 0, 0, 200, 76, 153 WINDOW_PLACEMENT_CENTER); 147 154 148 155 window_exec(main_window);
Note:
See TracChangeset
for help on using the changeset viewer.