mirror of
https://github.com/fltk/fltk.git
synced 2026-05-28 11:25:22 +08:00
Remove boxtype linke trick.
By defining boxtypes with underscores, box drawing cod ethat was not used was not linked, but with the introduction of themes, all boxes are available at all times. Reducing complexity.
This commit is contained in:
@@ -2258,10 +2258,10 @@ void Widget_Node::read_property(fld::io::Project_Reader &f, const char *c) {
|
||||
Fl_Menu_Item boxmenu1[] = {
|
||||
// these extra ones are for looking up fdesign saved strings:
|
||||
{"NO_FRAME", 0,nullptr,(void *)FL_NO_BOX},
|
||||
{"ROUNDED3D_UPBOX", 0,nullptr,(void *)_FL_ROUND_UP_BOX},
|
||||
{"ROUNDED3D_DOWNBOX", 0,nullptr,(void *)_FL_ROUND_DOWN_BOX},
|
||||
{"OVAL3D_UPBOX", 0,nullptr,(void *)_FL_ROUND_UP_BOX},
|
||||
{"OVAL3D_DOWNBOX", 0,nullptr,(void *)_FL_ROUND_DOWN_BOX},
|
||||
{"ROUNDED3D_UPBOX", 0,nullptr,(void *)FL_ROUND_UP_BOX},
|
||||
{"ROUNDED3D_DOWNBOX", 0,nullptr,(void *)FL_ROUND_DOWN_BOX},
|
||||
{"OVAL3D_UPBOX", 0,nullptr,(void *)FL_ROUND_UP_BOX},
|
||||
{"OVAL3D_DOWNBOX", 0,nullptr,(void *)FL_ROUND_DOWN_BOX},
|
||||
{"0", 0,nullptr,(void *)ZERO_ENTRY},
|
||||
{"1", 0,nullptr,(void *)FL_UP_BOX},
|
||||
{"2", 0,nullptr,(void *)FL_DOWN_BOX},
|
||||
|
||||
@@ -157,7 +157,7 @@ void Overlay_Window::draw() {
|
||||
const int CHECKSIZE = 8;
|
||||
// see if box is clear or a frame or rounded:
|
||||
if ((damage()&FL_DAMAGE_ALL) &&
|
||||
(!box() || (box()>=4&&!(box()&2)) || box()>=_FL_ROUNDED_BOX)) {
|
||||
(!box() || (box()>=4&&!(box()&2)) || box()>=FL_ROUNDED_BOX)) {
|
||||
// if so, draw checkerboard so user can see what areas are clear:
|
||||
for (int Y = 0; Y < h(); Y += CHECKSIZE)
|
||||
for (int X = 0; X < w(); X += CHECKSIZE) {
|
||||
|
||||
Reference in New Issue
Block a user