ui: added inner panel to simple widgets

Author: s.kushnirenko

src/graphics/elements/panel.h

@@ -12,7 +12,7 @@ struct painter;
 void outer_panel_draw(vec2i pos, int width_blocks, int height_blocks);
 
 void inner_panel_draw(int x, int y, int width_blocks, int height_blocks);
-
+inline void inner_panel_draw(vec2i pos, vec2i size) { inner_panel_draw(pos.x, pos.y, size.x, size.y); }
 void unbordered_panel_draw(int x, int y, int width_blocks, int height_blocks);
 
 void label_draw(int x, int y, int width_blocks, int type);

src/graphics/elements/ui.cpp

@@ -136,6 +136,8 @@ void ui::panel(vec2i pos, vec2i size, UiFlags_ flags) {
     const vec2i offset = g_state.offset();
     if (!!(flags & UiFlags_PanelOuter)) {
         outer_panel_draw(offset + pos, size.x, size.y);
+    } else if (!!(flags & UiFlags_PanelInner)) {
+        inner_panel_draw(offset + pos, size);
     }
 }
 
@@ -176,6 +178,17 @@ void ui::outer_panel::load(archive arch) {
     assert(!strcmp(type, "outer_panel"));
 }
 
+void ui::inner_panel::draw() {
+    ui::panel(pos, size, UiFlags_PanelInner);
+}
+
+void ui::inner_panel::load(archive arch) {
+    element::load(arch);
+
+    pcstr type = arch.r_string("type");
+    assert(!strcmp(type, "inner_panel"));
+}
+
 void ui::widget::draw() {
     for (auto &e : elements) {
         if (e->enabled) {
@@ -191,6 +204,8 @@ void ui::widget::load(archive arch) {
         element::ptr elm;
         if (!strcmp(type, "outer_panel")) {
             elm = std::make_shared<outer_panel>();
+        } else if (!strcmp(type, "inner_panel")) {
+            elm = std::make_shared<inner_panel>();
         } else if (!strcmp(type, "image")) {
             elm = std::make_shared<image>();
         } else if (!strcmp(type, "label")) {

src/graphics/elements/ui.h

@@ -20,6 +20,7 @@ enum UiFlags_ {
     UiFlags_None = 0,
     UiFlags_LabelCentered = 1 << 1,
     UiFlags_PanelOuter = 1 << 2,
+    UiFlags_PanelInner = 1 << 3,
 };
 
 namespace ui {
@@ -65,6 +66,11 @@ struct outer_panel : public element {
     virtual void load(archive elem) override;
 };
 
+struct inner_panel : public element {
+    virtual void draw() override;
+    virtual void load(archive elem) override;
+};
+
 struct elabel : public element {
     std::string _text;
     e_font _font;

src/scripts/ui.js

@@ -76,10 +76,15 @@ mission_briefing_window = {
 			font : FONT_NORMAL_BLACK_ON_LIGHT
 		},
 		objectives : {
-			type : "label", 
+			type : "label",
 			text : {group:62, id:7},
 			pos : {x:376, y:433},
 			font : FONT_NORMAL_BLACK_ON_LIGHT
+		},
+		objectives_panel : {
+			type : "inner_panel",
+			pos : {x:32, y:96},
+			size: {w:33, h:6}
 		}
 	}
 }

src/window/mission_briefing.cpp

@@ -90,7 +90,6 @@ static void draw_foreground(void) {
 
     g_mission_briefing.draw();
 
-    inner_panel_draw(32, 96, 33, 6);
     lang_text_draw(62, 10, 48, 104, FONT_NORMAL_WHITE_ON_DARK);
     int goal_index = 0;