#include "focus_cycle.h"
#include "openbox.h"
#include "window.h"
+#include "event.h"
#include "render/render.h"
#include <X11/Xlib.h>
#include <glib.h>
-#define ICON_SIZE 48
+#define ICON_SIZE 40
#define ICON_HILITE_WIDTH 2
#define ICON_HILITE_MARGIN 1
#define OUTSIDE_BORDER 3
texth = RrMinHeight(p->a_text);
/* find the height of the dialog */
- h = t + b + (icon_rows * ICON_SIZE) + (OUTSIDE_BORDER + texth);
+ h = t + b + (icon_rows * ICON_SIZE) + (OUTSIDE_BORDER*2 + texth);
/* get the position of the text */
textx = l;
/* set up the hilite texture for the background */
p->a_bg->texture[0].data.rgba.width = rgbaw;
p->a_bg->texture[0].data.rgba.height = rgbah;
+ p->a_bg->texture[0].data.rgba.alpha = 0xff;
p->hilite_rgba = g_new(RrPixel32, rgbaw * rgbah);
p->a_bg->texture[0].data.rgba.data = p->hilite_rgba;
const gint row = i / icons_per_row; /* starting from 0 */
const gint col = i % icons_per_row; /* starting from 0 */
gint innerx, innery;
+ RrPixel32 *icon_data;
/* find the dimensions of the icon inside it */
innerx = icons_center_x + l + (col * ICON_SIZE);
icon = client_icon(target->client, innerw, innerh);
p->a_icon->texture[0].data.rgba.width = icon->width;
p->a_icon->texture[0].data.rgba.height = icon->height;
+ if (target->client->iconic)
+ /* 7/16 alpha */
+ p->a_icon->texture[0].data.rgba.alpha = (0xff>>1 - 0xff>>4);
+ else
+ p->a_icon->texture[0].data.rgba.alpha = 0xff;
p->a_icon->texture[0].data.rgba.data = icon->data;
/* draw the icon */
p->a_icon->surface.parentx = innerx;
p->a_icon->surface.parenty = innery;
RrPaint(p->a_icon, target->win, innerw, innerh);
+
+ if (target->client->iconic)
+ g_free(icon_data);
}
}
popup.mapped = FALSE;
+ /* kill enter events cause by this unmapping */
+ event_ignore_all_queued_enters();
+
while(popup.targets) {
ObFocusCyclePopupTarget *t = popup.targets->data;