From 4322910c36e0abde19a3e6e9797f8f1d4a98da8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=28=C2=B4=E3=83=BB=CF=89=E3=83=BB=EF=BD=80=29?= Date: Sun, 5 May 2024 13:21:24 +0900 Subject: [PATCH] ADD: import display_filled_roundbox_clip from extended for drawing chat baloon --- src/simutrans/display/simgraph.h | 2 ++ src/simutrans/display/simgraph0.cc | 4 ++++ src/simutrans/display/simgraph16.cc | 10 ++++++++++ src/simutrans/gui/gui_theme.h | 2 ++ 4 files changed, 18 insertions(+) diff --git a/src/simutrans/display/simgraph.h b/src/simutrans/display/simgraph.h index c4fb18519..85caad708 100644 --- a/src/simutrans/display/simgraph.h +++ b/src/simutrans/display/simgraph.h @@ -245,6 +245,8 @@ void display_fillbox_wh_rgb(scr_coord_val xp, scr_coord_val yp, scr_coord_val w, void display_fillbox_wh_clip_rgb(scr_coord_val xp, scr_coord_val yp, scr_coord_val w, scr_coord_val h, PIXVAL color, bool dirty CLIP_NUM_DEF CLIP_NUM_DEFAULT_ZERO); +void display_filled_roundbox_clip(scr_coord_val xp, scr_coord_val yp, scr_coord_val w, scr_coord_val h, PIXVAL color, bool dirty); + void display_vline_wh_clip_rgb(scr_coord_val xp, scr_coord_val yp, scr_coord_val h, PIXVAL c, bool dirty CLIP_NUM_DEF CLIP_NUM_DEFAULT_ZERO); void display_flush_buffer(); diff --git a/src/simutrans/display/simgraph0.cc b/src/simutrans/display/simgraph0.cc index 63f749c03..277cae8d7 100644 --- a/src/simutrans/display/simgraph0.cc +++ b/src/simutrans/display/simgraph0.cc @@ -236,6 +236,10 @@ void display_vline_wh_clip_rgb(scr_coord_val, scr_coord_val, scr_coord_val, PIXV { } +void display_filled_roundbox_clip(scr_coord_val, scr_coord_val, scr_coord_val, scr_coord_val, PIXVAL, bool) +{ +} + void display_array_wh(scr_coord_val, scr_coord_val, scr_coord_val, scr_coord_val, const PIXVAL *) { } diff --git a/src/simutrans/display/simgraph16.cc b/src/simutrans/display/simgraph16.cc index a3f095a8b..314a1e9f8 100644 --- a/src/simutrans/display/simgraph16.cc +++ b/src/simutrans/display/simgraph16.cc @@ -3402,6 +3402,16 @@ void display_fillbox_wh_clip_rgb(scr_coord_val xp, scr_coord_val yp, scr_coord_v } +void display_filled_roundbox_clip(scr_coord_val xp, scr_coord_val yp, scr_coord_val w, scr_coord_val h, PIXVAL color, bool dirty) +{ + display_fillbox_wh_clip_rgb(xp+2, yp, w-4, h, color, dirty); + display_fillbox_wh_clip_rgb(xp, yp+2, 1, h-4, color, dirty); + display_fillbox_wh_clip_rgb(xp+1, yp+1, 1, h-2, color, dirty); + display_fillbox_wh_clip_rgb(xp+w-1, yp+2, 1, h-4, color, dirty); + display_fillbox_wh_clip_rgb(xp+w-2, yp+1, 1, h-2, color, dirty); +} + + /** * Draw vertical line */ diff --git a/src/simutrans/gui/gui_theme.h b/src/simutrans/gui/gui_theme.h index e90a8d939..ce99ec713 100644 --- a/src/simutrans/gui/gui_theme.h +++ b/src/simutrans/gui/gui_theme.h @@ -113,6 +113,8 @@ class image_t; #define D_H_SPACE (gui_theme_t::gui_hspace) #define D_V_SPACE (gui_theme_t::gui_vspace) +#define NO_SPACING (scr_size(0,0)) + // bars of goods waiting in stations #define D_WAITINGBAR_WIDTH (gui_theme_t::gui_waitingbar_width)