Alexander/nsxiv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Center humbnails in window

Browse Source
This commit is contained in:
Bert 2011-02-18 14:57:24 +01:00
parent 76cca4ecb6
commit 73a9279598
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -1,6 +1,6 @@
all: sxiv all: sxiv
VERSION=git-20110217 VERSION=git-20110218
CC?=gcc CC?=gcc
PREFIX?=/usr/local PREFIX?=/usr/local

11
thumbs.c
View File

@ -98,7 +98,9 @@ void tns_render(tns_t *tns, win_t *win) {
win_clear(win); win_clear(win);
x = y = 5; i = cnt % tns->cols ? 1 : 0;
tns->x = x = (win->w - MIN(cnt, tns->cols) * thumb_dim) / 2 + 5;
tns->y = y = (win->h - (cnt / tns->cols + i) * thumb_dim) / 2 + 5;
i = tns->first; i = tns->first;
while (i < cnt) { while (i < cnt) {
@ -107,13 +109,14 @@ void tns_render(tns_t *tns, win_t *win) {
win_draw_pixmap(win, tns->thumbs[i].pm, tns->thumbs[i].x, win_draw_pixmap(win, tns->thumbs[i].pm, tns->thumbs[i].x,
tns->thumbs[i].y, tns->thumbs[i].w, tns->thumbs[i].h); tns->thumbs[i].y, tns->thumbs[i].w, tns->thumbs[i].h);
if (++i % tns->cols == 0) { if (++i % tns->cols == 0) {
x = 5; x = tns->x;
y += thumb_dim; y += thumb_dim;
} else { } else {
x += thumb_dim; x += thumb_dim;
} }
} }
printf("%d, %d\n", tns->sel, tns->cnt);
tns_highlight(tns, win, -1); tns_highlight(tns, win, -1);
} }
@ -175,10 +178,10 @@ int tns_translate(tns_t *tns, int x, int y) {
int n; int n;
thumb_t *t; thumb_t *t;
if (!tns || x < 5 || y < 5) if (!tns || x < tns->x || y < tns->y)
return -1; return -1;
if ((n = y / thumb_dim * tns-> cols + x / thumb_dim) < tns->cnt) { if ((n = (y - tns->y) / thumb_dim * tns->cols + (x - tns->x) / thumb_dim) < tns->cnt) {
t = &tns->thumbs[n]; t = &tns->thumbs[n];
if (x > t->x && x < t->x + t->w && y > t->y && y < t->y + t->h) if (x > t->x && x < t->x + t->w && y > t->y && y < t->y + t->h)
return n; return n;

2
thumbs.h
View File

@ -39,6 +39,8 @@ typedef struct thumb_s {
typedef struct tns_s { typedef struct tns_s {
thumb_t *thumbs; thumb_t *thumbs;
int cnt; int cnt;
int x;
int y;
int cols; int cols;
int rows; int rows;
int first; int first;