diff options
author | Jaakko Keränen <jaakko.keranen@iki.fi> | 2021-03-12 20:03:21 +0200 |
---|---|---|
committer | Jaakko Keränen <jaakko.keranen@iki.fi> | 2021-03-12 20:05:46 +0200 |
commit | 088eb5f137c38bdcde4fc2e80fd40cf7c07fce9b (patch) | |
tree | 7b08fd3df1fb8f9efd0865b3d9fc49a38b3ad7f3 /src/ui/widget.c | |
parent | 9d73378d21f4644bf0e39fb09025553a0fff7cc4 (diff) |
Window: Embed reload button; sidebar context menu
Diffstat (limited to 'src/ui/widget.c')
-rw-r--r-- | src/ui/widget.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/ui/widget.c b/src/ui/widget.c index e9a162e3..4d2728b7 100644 --- a/src/ui/widget.c +++ b/src/ui/widget.c | |||
@@ -972,9 +972,9 @@ iAny *hitChild_Widget(const iWidget *d, iInt2 coord) { | |||
972 | if (found) return found; | 972 | if (found) return found; |
973 | } | 973 | } |
974 | } | 974 | } |
975 | if ((d->flags & overflowScrollable_WidgetFlag || class_Widget(d) != &Class_Widget || | 975 | if ((d->flags & (overflowScrollable_WidgetFlag | hittable_WidgetFlag) || |
976 | d->flags & mouseModal_WidgetFlag) && ~d->flags & unhittable_WidgetFlag && | 976 | class_Widget(d) != &Class_Widget || d->flags & mouseModal_WidgetFlag) && |
977 | contains_Widget(d, coord)) { | 977 | ~d->flags & unhittable_WidgetFlag && contains_Widget(d, coord)) { |
978 | return iConstCast(iWidget *, d); | 978 | return iConstCast(iWidget *, d); |
979 | } | 979 | } |
980 | return NULL; | 980 | return NULL; |
@@ -1199,8 +1199,9 @@ static void printTree_Widget_(const iWidget *d, int indent) { | |||
1199 | cstr_String(text_LabelWidget((const iLabelWidget *) d)), | 1199 | cstr_String(text_LabelWidget((const iLabelWidget *) d)), |
1200 | cstr_String(command_LabelWidget((const iLabelWidget *) d))); | 1200 | cstr_String(command_LabelWidget((const iLabelWidget *) d))); |
1201 | } | 1201 | } |
1202 | printf("size:%dx%d flags:%08llx\n", d->rect.size.x, d->rect.size.y, | 1202 | printf("size:%dx%d [%d..%d %d:%d] flags:%08llx%s\n", d->rect.size.x, d->rect.size.y, |
1203 | (long long unsigned int) d->flags); | 1203 | d->padding[0], d->padding[2], d->padding[1], d->padding[3], |
1204 | (long long unsigned int) d->flags, d->flags & tight_WidgetFlag ? " tight" : ""); | ||
1204 | iConstForEach(ObjectList, i, d->children) { | 1205 | iConstForEach(ObjectList, i, d->children) { |
1205 | printTree_Widget_(i.object, indent + 1); | 1206 | printTree_Widget_(i.object, indent + 1); |
1206 | } | 1207 | } |