Changeset cd74fa8 in mainline for uspace/lib/ui/src/wdecor.c
- Timestamp:
- 2021-03-01T22:20:27Z (3 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- d6f46c8
- Parents:
- 9c7dc8e
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/lib/ui/src/wdecor.c
r9c7dc8e rcd74fa8 59 59 wdecor_corner_h = 24, 60 60 wdecor_edge_w = 4, 61 wdecor_edge_h = 4 61 wdecor_edge_h = 4, 62 wdecor_tbar_h = 22, 63 wdecor_tbar_h_text = 1, 64 wdecor_frame_w = 4, 65 wdecor_frame_w_text = 1 62 66 }; 63 67 … … 180 184 return rc; 181 185 182 rc = ui_paint_bevel(wdecor->res->gc, &rect, 183 wdecor->res->wnd_highlight_color, 184 wdecor->res->wnd_shadow_color, 1, &rect); 185 if (rc != EOK) 186 return rc; 187 188 rc = ui_paint_bevel(wdecor->res->gc, &rect, 189 wdecor->res->wnd_face_color, 190 wdecor->res->wnd_face_color, 2, &rect); 191 if (rc != EOK) 192 return rc; 186 if (wdecor->res->textmode == false) { 187 rc = ui_paint_bevel(wdecor->res->gc, &rect, 188 wdecor->res->wnd_highlight_color, 189 wdecor->res->wnd_shadow_color, 1, &rect); 190 if (rc != EOK) 191 return rc; 192 193 rc = ui_paint_bevel(wdecor->res->gc, &rect, 194 wdecor->res->wnd_face_color, 195 wdecor->res->wnd_face_color, 2, &rect); 196 if (rc != EOK) 197 return rc; 198 } 193 199 } 194 200 … … 196 202 trect = geom.title_bar_rect; 197 203 198 rc = ui_paint_bevel(wdecor->res->gc, &trect, 199 wdecor->res->wnd_shadow_color, 200 wdecor->res->wnd_highlight_color, 1, &trect); 201 if (rc != EOK) 202 return rc; 204 if (wdecor->res->textmode == false) { 205 rc = ui_paint_bevel(wdecor->res->gc, &trect, 206 wdecor->res->wnd_shadow_color, 207 wdecor->res->wnd_highlight_color, 1, &trect); 208 if (rc != EOK) 209 return rc; 210 } 203 211 204 212 rc = gfx_set_color(wdecor->res->gc, wdecor->active ? … … 292 300 void ui_wdecor_get_geom(ui_wdecor_t *wdecor, ui_wdecor_geom_t *geom) 293 301 { 302 gfx_coord_t frame_w; 303 gfx_coord_t tbar_h; 304 294 305 /* Does window have a frame? */ 295 306 if ((wdecor->style & ui_wds_frame) != 0) { 296 geom->interior_rect.p0.x = wdecor->rect.p0.x + 4; 297 geom->interior_rect.p0.y = wdecor->rect.p0.y + 4; 298 geom->interior_rect.p1.x = wdecor->rect.p1.x - 4; 299 geom->interior_rect.p1.y = wdecor->rect.p1.y - 4; 307 frame_w = wdecor->res->textmode ? 308 wdecor_frame_w_text : wdecor_frame_w; 309 310 geom->interior_rect.p0.x = wdecor->rect.p0.x + frame_w; 311 geom->interior_rect.p0.y = wdecor->rect.p0.y + frame_w; 312 geom->interior_rect.p1.x = wdecor->rect.p1.x - frame_w; 313 geom->interior_rect.p1.y = wdecor->rect.p1.y - frame_w; 300 314 } else { 301 315 geom->interior_rect = wdecor->rect; … … 304 318 /* Does window have a title bar? */ 305 319 if ((wdecor->style & ui_wds_titlebar) != 0) { 320 tbar_h = wdecor->res->textmode ? 321 wdecor_tbar_h_text : wdecor_tbar_h; 322 306 323 geom->title_bar_rect.p0 = geom->interior_rect.p0; 307 324 geom->title_bar_rect.p1.x = geom->interior_rect.p1.x; 308 geom->title_bar_rect.p1.y = geom->interior_rect.p0.y + 22;325 geom->title_bar_rect.p1.y = geom->interior_rect.p0.y + tbar_h; 309 326 310 327 geom->app_area_rect.p0.x = geom->interior_rect.p0.x; … … 322 339 /* Does window have a close button? */ 323 340 if ((wdecor->style & ui_wds_close_btn) != 0) { 324 geom->btn_close_rect.p0.x = geom->title_bar_rect.p1.x - 1 - 20; 325 geom->btn_close_rect.p0.y = geom->title_bar_rect.p0.y + 1; 326 geom->btn_close_rect.p1.x = geom->title_bar_rect.p1.x - 1; 327 geom->btn_close_rect.p1.y = geom->title_bar_rect.p0.y + 1 + 20; 341 if (wdecor->res->textmode == false) { 342 geom->btn_close_rect.p0.x = 343 geom->title_bar_rect.p1.x - 1 - 20; 344 geom->btn_close_rect.p0.y = 345 geom->title_bar_rect.p0.y + 1; 346 geom->btn_close_rect.p1.x = 347 geom->title_bar_rect.p1.x - 1; 348 geom->btn_close_rect.p1.y = 349 geom->title_bar_rect.p0.y + 1 + 20; 350 } else { 351 geom->btn_close_rect.p0.x = 352 geom->title_bar_rect.p1.x - 1 - 3; 353 geom->btn_close_rect.p0.y = 354 geom->title_bar_rect.p0.y; 355 geom->btn_close_rect.p1.x = 356 geom->title_bar_rect.p1.x - 1; 357 geom->btn_close_rect.p1.y = 358 geom->title_bar_rect.p0.y + 1; 359 } 328 360 } else { 329 361 geom->btn_close_rect.p0.x = 0;
Note:
See TracChangeset
for help on using the changeset viewer.