projects
/
geeqie.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e6ad0f0
)
Simplify pan_item_image_find_size()
author
Arkadiy Illarionov
<qarkai@gmail.com>
Sat, 13 Apr 2024 22:43:23 +0000
(
01:43
+0300)
committer
Colin Clark
<colin.clark@cclark.uk>
Sun, 14 Apr 2024 10:00:37 +0000
(11:00 +0100)
src/pan-view/pan-item.cc
patch
|
blob
|
history
diff --git
a/src/pan-view/pan-item.cc
b/src/pan-view/pan-item.cc
index
0b8d591
..
13b4dec
100644
(file)
--- a/
src/pan-view/pan-item.cc
+++ b/
src/pan-view/pan-item.cc
@@
-616,14
+616,11
@@
gint pan_item_thumb_draw(PanWindow *pw, PanItem *pi, GdkPixbuf *pixbuf, PixbufRe
*-----------------------------------------------------------------------------
*/
*-----------------------------------------------------------------------------
*/
-static void pan_item_image_find_size(PanWindow *pw,
PanItem *pi, gint w, gint
h)
+static void pan_item_image_find_size(PanWindow *pw,
const FileData *fd, gint &w, gint &
h)
{
GList *work;
{
GList *work;
- pi->width = w;
- pi->height = h;
-
- if (!pi->fd) return;
+ if (!fd) return;
work = pw->cache_list;
while (work)
work = pw->cache_list;
while (work)
@@
-634,10
+631,10
@@
static void pan_item_image_find_size(PanWindow *pw, PanItem *pi, gint w, gint h)
work = work->next;
if (pc->cd && pc->cd->dimensions &&
work = work->next;
if (pc->cd && pc->cd->dimensions &&
- pc->fd
&& pc->fd == pi->
fd)
+ pc->fd
==
fd)
{
{
-
pi->width
= MAX(1, pc->cd->width * pw->image_size / 100);
-
pi->height
= MAX(1, pc->cd->height * pw->image_size / 100);
+
w
= MAX(1, pc->cd->width * pw->image_size / 100);
+
h
= MAX(1, pc->cd->height * pw->image_size / 100);
pw->cache_list = g_list_remove(pw->cache_list, pc);
pan_cache_data_free(pc);
pw->cache_list = g_list_remove(pw->cache_list, pc);
pan_cache_data_free(pc);
@@
-650,11
+647,15
@@
PanItem *pan_item_image_new(PanWindow *pw, FileData *fd, gint x, gint y, gint w,
{
PanItem *pi;
{
PanItem *pi;
+ pan_item_image_find_size(pw, fd, w, h);
+
pi = g_new0(PanItem, 1);
pi->type = PAN_ITEM_IMAGE;
pi->fd = fd;
pi->x = x;
pi->y = y;
pi = g_new0(PanItem, 1);
pi->type = PAN_ITEM_IMAGE;
pi->fd = fd;
pi->x = x;
pi->y = y;
+ pi->width = w;
+ pi->height = h;
pi->color.a = 255;
pi->color.a = 255;
@@
-663,8
+664,6
@@
PanItem *pan_item_image_new(PanWindow *pw, FileData *fd, gint x, gint y, gint w,
pi->color2.b = 0;
pi->color2.a = PAN_SHADOW_ALPHA / 2;
pi->color2.b = 0;
pi->color2.a = PAN_SHADOW_ALPHA / 2;
- pan_item_image_find_size(pw, pi, w, h);
-
pw->list = g_list_prepend(pw->list, pi);
return pi;
pw->list = g_list_prepend(pw->list, pi);
return pi;