feat: fade out the background behind dialog windows

Author: EmilyV99

resources/base_config/zquest.cfg

@@ -25,6 +25,11 @@ merge_cpane_compact = 1
 zoom_fav_compact = 1
 zoom_cmd_compact = 1
 
+dlg_tint_r = 0
+dlg_tint_g = 0
+dlg_tint_b = 0
+dlg_tint_a = 128
+
 [Theme]
 theme_filename = themes/mooshmood.ztheme
 

src/base/render.cpp

@@ -30,7 +30,11 @@ void RenderTreeItem::remove_child(RenderTreeItem* child)
 		child->parent = nullptr;
 	}
 }
-const std::vector<RenderTreeItem*>& RenderTreeItem::get_children() const
+std::vector<RenderTreeItem*> const& RenderTreeItem::get_children() const
+{
+	return children;
+}
+std::vector<RenderTreeItem*>& RenderTreeItem::get_children()
 {
 	return children;
 }
@@ -162,6 +166,9 @@ RenderTreeItem::~RenderTreeItem()
 			al_destroy_bitmap(bitmap);
 		if(a4_bitmap)
 			destroy_bitmap(a4_bitmap);
+	}
+	if(owned_tint)
+	{
 		if(tint)
 			delete tint;
 	}
@@ -347,6 +354,7 @@ static void render_tree_draw_item(RenderTreeItem* rti)
 		int th = y1 - y0;
 		if (rti->tint)
 		{
+			al_draw_scaled_bitmap(rti->bitmap, 0, 0, w, h, x0, y0, tw, th, 0);
 			al_draw_tinted_scaled_bitmap(rti->bitmap, *rti->tint, 0, 0, w, h, x0, y0, tw, th, 0);
 		}
 		else
@@ -643,3 +651,35 @@ void remove_dlg_layer(RenderTreeItem* rti)
 	}
 	delete rti;
 }
+
+ALLEGRO_COLOR dialog_tint = al_premul_rgba(0, 0, 0, 64);
+ALLEGRO_COLOR* override_dlg_tint = nullptr;
+static size_t dlg_tint_pause = 0;
+void reload_dialog_tints()
+{
+	std::vector<RenderTreeItem*>& children = rti_dialogs.get_children();
+	if(children.empty()) return;
+	for(size_t q = 0; q < children.size()-1; ++q)
+	{
+		children[q]->tint = dlg_tint_pause ? nullptr :
+			(override_dlg_tint ? override_dlg_tint : &dialog_tint);
+	}
+	children.back()->tint = nullptr;
+}
+ALLEGRO_COLOR& get_dlg_tint()
+{
+	return override_dlg_tint ? *override_dlg_tint : dialog_tint;
+}
+void pause_dlg_tint(bool pause)
+{
+	if(pause)
+		++dlg_tint_pause;
+	else if(dlg_tint_pause)
+		--dlg_tint_pause;
+}
+bool dlg_tint_paused()
+{
+	return dlg_tint_pause;
+}
+
+

src/base/render.h

@@ -97,15 +97,16 @@ class RenderTreeItem
 	BITMAP* a4_bitmap = nullptr;
 	bool freeze_a4_bitmap_render = false;
 	ALLEGRO_COLOR* tint = nullptr;
-	bool owned = false;
+	bool owned = false, owned_tint = false;
 
 	RenderTreeItem(std::string name, RenderTreeItem* parent = nullptr);
 	~RenderTreeItem();
 
 	void add_child(RenderTreeItem* child);
 	void add_child_before(RenderTreeItem* child, RenderTreeItem* before_child);
 	void remove_child(RenderTreeItem* child);
-	const std::vector<RenderTreeItem*>& get_children() const;
+	std::vector<RenderTreeItem*>& get_children();
+	std::vector<RenderTreeItem*> const& get_children() const;
 	bool has_children() const;
 	void handle_dirty();
 	void mark_dirty();
@@ -167,11 +168,16 @@ void zc_set_palette_range(PALETTE pal, int start, int end, bool=false);
 void render_a4_a5(BITMAP* src,int sx,int sy,int dx,int dy,int w,int h,int maskind = 0,uint32_t* backpal = nullptr);
 
 extern BITMAP* zqdialog_bg_bmp;
+extern ALLEGRO_COLOR* override_dlg_tint;
 void popup_zqdialog_start(int x = 0, int y = 0, int w = -1, int h = -1, int transp = 0xFF);
 void popup_zqdialog_end();
 void popup_zqdialog_start_a5();
 void popup_zqdialog_end_a5();
 RenderTreeItem* add_dlg_layer(int x = 0, int y = 0, int w = -1, int h = -1);
 void remove_dlg_layer(RenderTreeItem* rti);
+void reload_dialog_tints();
+ALLEGRO_COLOR& get_dlg_tint();
+void pause_dlg_tint(bool pause);
+bool dlg_tint_paused();
 
 #endif

src/launcher/launcher.cpp

@@ -575,6 +575,7 @@ static void configure_render_tree()
 		});
 		rti_dialogs.visible = true;
 	}
+	reload_dialog_tints();
 }
 
 static void render_launcher()

src/zc/render.cpp

@@ -252,6 +252,7 @@ static void configure_render_tree()
 		rti_game.tint = nullptr;
 		rti_infolayer.tint = nullptr;
 	}
+	reload_dialog_tints();
 }
 
 static ALLEGRO_STATE infobmp_old_state;

src/zq/render.cpp

@@ -9,6 +9,7 @@ static RenderTreeItem rti_root("root");
 static RenderTreeItem rti_screen("screen");
 static RenderTreeItem rti_mmap("mmap");
 static RenderTreeItem rti_tooltip("tooltip");
+static RenderTreeItem rti_tint("tint");
 
 static int zc_gui_mouse_x()
 {
@@ -44,13 +45,17 @@ static void init_render_tree()
 	rti_tooltip.transparency_index = 0;
 	clear_bitmap(rti_tooltip.a4_bitmap);
 
+	rti_tint.bitmap = create_a5_bitmap(screen->w, screen->h);
+	rti_tint.visible = false;
+	
 	set_bitmap_create_flags(true);
 	rti_mmap.bitmap = create_a5_bitmap(screen->w, screen->h);
 
 	rti_screen.add_child(&rti_mmap);
 
 	rti_root.add_child(&rti_screen);
 	rti_root.add_child(&rti_tooltip);
+	rti_root.add_child(&rti_tint);
 	rti_root.add_child(&rti_dialogs);
 
 	gui_mouse_x = zc_gui_mouse_x;
@@ -64,7 +69,7 @@ static void init_render_tree()
 static void configure_render_tree()
 {
 	static bool scaling_force_integer = zc_get_config("zquest", "scaling_force_integer", 0) != 0;
-
+	
 	int resx = al_get_display_width(all_get_display());
 	int resy = al_get_display_height(all_get_display());
 
@@ -107,9 +112,38 @@ static void configure_render_tree()
 			.xscale = xscale,
 			.yscale = yscale,
 		});
+		rti_tint.set_transform({
+			.x = (int)(resx - w*xscale) / 2,
+			.y = (int)(resy - h*yscale) / 2,
+			.xscale = xscale,
+			.yscale = yscale,
+		});
 	}
-
+	
 	rti_dialogs.visible = rti_dialogs.has_children();
+	rti_tint.visible = rti_dialogs.visible && !dlg_tint_paused();
+	
+	if(rti_dialogs.visible)
+	{
+		auto& tint = get_dlg_tint();
+		if(!override_dlg_tint)
+		{
+			tint = al_premul_rgba(
+				zc_get_config("ZQ_GUI","dlg_tint_r",0),
+				zc_get_config("ZQ_GUI","dlg_tint_g",0),
+				zc_get_config("ZQ_GUI","dlg_tint_b",0),
+				zc_get_config("ZQ_GUI","dlg_tint_a",128)
+			);
+		}
+		
+		ALLEGRO_STATE oldstate;
+		al_store_state(&oldstate, ALLEGRO_STATE_TARGET_BITMAP);
+		al_set_target_bitmap(rti_tint.bitmap);
+		al_clear_to_color(tint);
+		al_restore_state(&oldstate);
+	}
+	
+	reload_dialog_tints();
 }
 
 ALLEGRO_BITMAP* get_overlay_bmp()

src/zq/zquest.cpp

@@ -14805,6 +14805,7 @@ int32_t onScreenPalette()
 
 	large_dialog(screen_pal_dlg);
 	auto old_valid = Map.CurrScr()->valid;
+	pause_dlg_tint(true);
 	while(true)
 	{
 		auto ret = do_zqdialog(screen_pal_dlg,2);
@@ -14830,6 +14831,7 @@ int32_t onScreenPalette()
 			break;
 		}
 	}
+	pause_dlg_tint(false);
 
 	rebuild_trans_table();