luisgulo/gambas-source-code
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix SvgImage.Render(). Correctly release the current grab when the debugger wakes up.

Browse source 
[GB.GTK]
* BUG: Fix SvgImage.Render() so that it correctly stretches the result.
* BUG: Correctly release the current grab when the debugger wakes up.

[GB.GTK3]
* BUG: Fix SvgImage.Render() so that it correctly stretches the result.
* BUG: Correctly release the current grab when the debugger wakes up.
This commit is contained in:
Benoît Minisini 2023-01-12 00:54:19 +01:00
parent 2687a8607b
commit ee040e1b14
4 changed files with 72 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

94
gb.gtk/src/csvgimage.cpp
View file

@ -78,8 +78,22 @@ static const char *load_file(CSVGIMAGE *_object, const char *path, int len_path)
THIS->handle = handle;
#if LIBRSVG_CHECK_VERSION(2,52,0)
rsvg_handle_get_intrinsic_size_in_pixels(handle, &THIS->width, &THIS->height);
#if LIBRSVG_CHECK_VERSION(2,46,0)
gboolean has_width, has_height, has_viewbox;
RsvgLength width;
RsvgLength height;
RsvgRectangle viewbox;
rsvg_handle_get_intrinsic_dimensions(handle, &has_width, &width, &has_height, &height, &has_viewbox, &viewbox);
if (has_viewbox)
{
THIS->width = viewbox.width;
THIS->height = viewbox.height;
}
else if (has_width && has_height && width.unit == height.unit)
{
THIS->width = width.length;
THIS->height = height.length;
}
#else
RsvgDimensionData dim;
rsvg_handle_get_dimensions(handle, &dim);
@ -97,7 +111,7 @@ __RETURN:
static void paint_svg(CSVGIMAGE *_object, cairo_t *context, double x, double y, double w, double h)
{
cairo_matrix_t matrix;
double sx, sy;
double sx, sy, ss;
if (!context)
return;
@ -108,44 +122,66 @@ static void paint_svg(CSVGIMAGE *_object, cairo_t *context, double x, double y,
if (!HANDLE && !SURFACE)
return;
if (w <= 0)
{
w = THIS->width;
sx = 1;
}
else
sx = w / THIS->width;
if (h <= 0)
{
h = THIS->height;
sy = 1;
}
else
sy = h / THIS->height;
cairo_get_matrix(context, &matrix);
cairo_scale(context, sx, sy);
cairo_translate(context, x, y);
if (HANDLE)
{
#if LIBRSVG_CHECK_VERSION(2,46,0)
if (w <= 0)
{
w = THIS->width;
sx = 1;
}
else
sx = w / THIS->width;
if (h <= 0)
{
h = THIS->height;
sy = 1;
}
else
sy = h / THIS->height;
#if LIBRSVG_CHECK_VERSION(2,46,0)
RsvgRectangle view;
view.x = 0;
view.y = 0;
view.width = THIS->width;
view.height = THIS->height;
view.x = x;
view.y = y;
view.width = w;
view.height = h;
if ((h/w) != (THIS->height/THIS->width))
{
//fprintf(stderr, "%g / %g\n", h/w, THIS->height/THIS->width);
if ((h/w) < (THIS->height/THIS->width))
{
ss = w/h/(THIS->width/THIS->height);
cairo_translate(context, -((x + w / 2) * (ss - 1)), 0);
cairo_scale(context, ss, 1);
}
else
{
ss = h/w/(THIS->height/THIS->width);
cairo_translate(context, 0, -((y + h / 2) * (ss - 1)));
cairo_scale(context, 1, ss);
}
}
rsvg_handle_render_document(HANDLE, context, &view, NULL);
#else
cairo_set_matrix(context, &matrix);
#endif
cairo_scale(context, sx, sy);
cairo_translate(context, x, y);
#if !LIBRSVG_CHECK_VERSION(2,46,0)
rsvg_handle_render_cairo(HANDLE, context);
#endif
#endif
}
if (SURFACE)

2
gb.gtk/src/gdrag.cpp
View file

@ -54,7 +54,7 @@ typedef
static int _current_clipboard = gClipboard::Clipboard;
static GtkClipboard *_clipboard = NULL;
static GtkClipboard *_selection = NULL;
static bool _clipboard_has_changed[2] = { FALSE };
static bool _clipboard_has_changed[2] = { TRUE };
static char *convert_format(char *fmt)
{

5
gb.gtk/src/gmenu.cpp
View file

@ -843,7 +843,10 @@ void gMenu::doPopup(bool move, int x, int y)
return;
gMenu *save_current_popup = _current_popup;
GtkWidget *save_grab = gApplication::_popup_grab;
_current_popup = this;
gApplication::_popup_grab = GTK_WIDGET(_popup);
_in_popup++;
_popup_count++;
@ -917,7 +920,9 @@ void gMenu::doPopup(bool move, int x, int y)
MAIN_do_iteration(false);
_exec = false;
_current_popup = save_current_popup;
gApplication::_popup_grab = save_grab;
_in_popup--;

4
gb.gtk3/src/main.cpp
View file

@ -353,10 +353,8 @@ void EXPORT GB_SIGNAL(int signal, void *param)
break;
case GB_SIGNAL_DEBUG_FORWARD:
//while (qApp->activePopupWidget())
// delete qApp->activePopupWidget();
if (gdk_display_get_default())
gdk_display_sync(gdk_display_get_default());
gdk_display_sync(gdk_display_get_default());
break;
case GB_SIGNAL_DEBUG_CONTINUE: