Make it possible to set the font in the deck meta.

assets/layouts.json

@@ -10,7 +10,7 @@
       "[=title|=*%(200,100)description|_|_|_]"
   ],
   "default_slide": [
-      "[=*%(300,200)title|_|_|_|_]",
+      "[*%(300,200)title|_|_|_|_]",
       "[_|_|_]",
       "[*%(300,600)content|_|_|*%(200,600)image|_]",
       "[_|_|_|_|_]",

src/app.cpp

@@ -53,7 +53,6 @@ bool App::open() {
 }
 
 std::shared_ptr<SlidesUI> App::load_slides() {
-  try {
   auto deck = parse_slides(options.deck_file, [&](nlohmann::json& config) {
       backend.set_font(config["font_file"]);
       guecs::init(&backend);
@@ -65,8 +64,4 @@ std::shared_ptr<SlidesUI> App::load_slides() {
   slides->init();
 
   return slides;
-  } catch(...) {
-    fmt::println("ERROR!");
-    return nullptr;
-  }
 }

src/slides_ui.cpp

@@ -57,7 +57,7 @@ void Slide::init(lel::Cell& cell, const std::string& layout) {
   }
 }
 
-void Slide::config_text(guecs::Text &result, nlohmann::json& config, std::string prefix) {
+void Slide::config_text(guecs::Text &result, nlohmann::json& config, const std::string& prefix) {
   if(config.contains(prefix + "_size")) result.size = config[prefix + "_size"];
 
   if(config.contains(prefix + "_color")) {
@@ -163,34 +163,42 @@ void SlidesUI::set_slide(size_t index) {
   show_slide();
 }
 
+auto optional_config(const std::string& name, json& config_a, json& config_b) {
+  if(config_a.contains(name)) {
+    return config_a[name];
+  } else {
+    return config_b[name];
+  }
+}
+
+bool SlidesUI::has_optional(const std::string& name, json& slide_config) {
+  return slide_config.contains(name) || $deck->config.contains(name);
+}
+
 void SlidesUI::show_slide() {
-  // THIS NEEDS TO BE DONE FOR ALL SLIDES OR CONTROL CAN'T SHOW NEXT SLIDE
-  //  MOVE TO DECK
   auto& slide = $deck->current_slide();
 
   // kind of have to set the background for the whole UI using the slide config
   auto& bg = $gui.get<guecs::Background>($gui.MAIN);
-  sf::Color color = guecs::THEME.FILL_COLOR;
 
-  if(slide.$config.contains("bg_image")) {
+  if(has_optional("bg_image", slide.$config)) {
-    bg.set_sprite(slide.$config["bg_image"], true);
+    bg.set_sprite(optional_config("bg_image", slide.$config, $deck->config), true);
-  } else if($deck->config.contains("bg_image")) {
-    bg.set_sprite($deck->config["bg_image"], true);
   } else {
     bg.sprite = nullptr;
     bg.texture = nullptr;
   }
 
-  if(slide.$config.contains("bg_color")) {
+  if(has_optional("bg_color", slide.$config)) {
-    auto color_conf = slide.$config["bg_color"];
+    auto color_conf = optional_config("bg_color", slide.$config, $deck->config);
-    color = {color_conf[0], color_conf[1], color_conf[2], color_conf[3]};
+    bg.set_color({color_conf[0], color_conf[1], color_conf[2], color_conf[3]});
-  } else if($deck->config.contains("bg_color")) {
+  } else {
-    auto color_conf = $deck->config["bg_color"];
+    bg.set_color(guecs::THEME.FILL_COLOR);
-    color = {color_conf[0], color_conf[1], color_conf[2], color_conf[3]};
   }
 
-  if(slide.$config.contains("shader")) {
+  bg.init();
-    slide.$shader = shaders::get(slide.$config["shader"]);
+
+  if(has_optional("shader", slide.$config)) {
+    slide.$shader = shaders::get(optional_config("shader", slide.$config, $deck->config));
     slide.$shader->setUniform("u_resolution", sf::Vector2f{WINDOW_WIDTH, WINDOW_HEIGHT});
   } else {
     slide.$shader = nullptr;
@@ -198,21 +206,19 @@ void SlidesUI::show_slide() {
 
   std::string layout_name{"default_slide"};
 
-  if(slide.$config.contains("layout")) {
+  if(has_optional("layout", slide.$config)) {
-    layout_name = slide.$config["layout"];
+    layout_name = optional_config("layout", slide.$config, $deck->config);
   }
 
   auto& layout = $layouts[layout_name];
 
-  bg.set_color(color);
-  bg.init();
-
   auto& cell = $gui.cell_for("slide");
 
   slide.init(cell, layout);
 }
 
 void SlidesUI::render(sf::RenderTarget& window) {
+  window.clear();
   $gui.render($view_texture);
   auto& slide = $deck->current_slide();
   slide.render($view_texture);

src/slides_ui.hpp

@@ -25,7 +25,7 @@ struct Slide {
 
   void init(lel::Cell& cell, const std::string& layout);
   void render(sf::RenderTarget& view);
-  void config_text(guecs::Text &result, nlohmann::json& config, std::string prefix);
+  void config_text(guecs::Text &result, nlohmann::json& deck_config, const std::string& prefix);
 };
 
 using SlideSet = std::vector<Slide>;
@@ -66,4 +66,5 @@ struct SlidesUI {
   void update(sf::RenderWindow& presenter);
   void handle_events(sf::RenderWindow& presenter, const sf::Event& event);
   void configure_layouts();
+  bool has_optional(const std::string& name, nlohmann::json& slide_config);
 };