diff options
| -rw-r--r-- | src/widget.cpp | 52 | ||||
| -rw-r--r-- | src/widget_type.h | 3 | ||||
| -rw-r--r-- | src/window.cpp | 3 |
3 files changed, 55 insertions, 3 deletions
diff --git a/src/widget.cpp b/src/widget.cpp index b9749acc4..3202959a7 100644 --- a/src/widget.cpp +++ b/src/widget.cpp @@ -2339,3 +2339,55 @@ NWidgetContainer *MakeNWidgets(const NWidgetPart *parts, int count, int *biggest MakeWidgetTree(parts, count, &cont_ptr, biggest_index); return container; } + +/** Make a nested widget tree for a window from a parts array. Besides loading, it inserts a shading selection widget + * between the title bar and the window body if the first widget in the parts array looks like a title bar (it is a horizontal + * container with a caption widget) and has a shade box widget. + * @param parts Array with parts of the widgets. + * @param count Length of the \a parts array. + * @param biggest_index Pointer to biggest nested widget index collected in the tree. + * @param [out] shade_select Pointer to the inserted shade selection widget (\c NULL if not unserted). + * @return Root of the nested widget tree, a vertical container containing the entire GUI. + * @ingroup NestedWidgetParts + * @pre \c biggest_index != NULL + * @post \c *biggest_index contains the largest widget index of the tree and \c -1 if no index is used. + */ +NWidgetContainer *MakeWindowNWidgetTree(const NWidgetPart *parts, int count, int *biggest_index, NWidgetStacked **shade_select) +{ + *biggest_index = -1; + + /* Read the first widget recursively from the array. */ + NWidgetBase *nwid = NULL; + int num_used = MakeWidgetTree(parts, count, &nwid, biggest_index); + assert(nwid != NULL); + parts += num_used; + count -= num_used; + + NWidgetContainer *root = new NWidgetVertical; + root->Add(nwid); + if (count == 0) { // There is no body at all. + *shade_select = NULL; + return root; + } + + /* If the first widget looks like a titlebar, treat it as such. + * If it has a shading box, silently add a shade selection widget in the tree. */ + NWidgetHorizontal *hor_cont = dynamic_cast<NWidgetHorizontal *>(nwid); + NWidgetContainer *body; + if (hor_cont != NULL && hor_cont->GetWidgetOfType(WWT_CAPTION) != NULL && hor_cont->GetWidgetOfType(WWT_SHADEBOX) != NULL) { + *shade_select = new NWidgetStacked; + root->Add(*shade_select); + body = new NWidgetVertical; + (*shade_select)->Add(body); + } else { + *shade_select = NULL; + body = root; + } + + /* Load the remaining parts into 'body'. */ + int biggest2 = -1; + MakeNWidgets(parts, count, &biggest2, body); + + *biggest_index = max(*biggest_index, biggest2); + return root; +} diff --git a/src/widget_type.h b/src/widget_type.h index b6bbbbabb..f54381e61 100644 --- a/src/widget_type.h +++ b/src/widget_type.h @@ -781,6 +781,7 @@ static inline NWidgetPart NWidgetFunction(NWidgetFunctionType *func_ptr) return part; } -NWidgetContainer *MakeNWidgets(const NWidgetPart *parts, int count, int *biggest_index, NWidgetContainer *container = NULL); +NWidgetContainer *MakeNWidgets(const NWidgetPart *parts, int count, int *biggest_index, NWidgetContainer *container); +NWidgetContainer *MakeWindowNWidgetTree(const NWidgetPart *parts, int count, int *biggest_index, NWidgetStacked **shade_select); #endif /* WIDGET_TYPE_H */ diff --git a/src/window.cpp b/src/window.cpp index 1b3028526..f0d3ce931 100644 --- a/src/window.cpp +++ b/src/window.cpp @@ -1206,8 +1206,7 @@ static Point LocalGetWindowPlacement(const WindowDesc *desc, int16 sm_width, int void Window::CreateNestedTree(const WindowDesc *desc, bool fill_nested) { int biggest_index = -1; - NWidgetBase *nested_root = MakeNWidgets(desc->nwid_parts, desc->nwid_length, &biggest_index); - this->nested_root = nested_root; + this->nested_root = MakeWindowNWidgetTree(desc->nwid_parts, desc->nwid_length, &biggest_index, &this->shade_select); this->nested_array_size = (uint)(biggest_index + 1); if (fill_nested) { |