This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project wmaker-crm.git.
The branch, next has been updated
via 448a68c6d2812f74a83eed8da7ed7c5abb0ade1c (commit)
via af41673dbf35c663ddba82f99a34b6651060b1b1 (commit)
via 2e7b7b7e026e3c58c08afceab8236ea7a3cf28df (commit)
via 35a2ed24ec0e2fbf968605c31c9554faf1cd4fa9 (commit)
from bb0c1f303535bed85876e69f2149877d8fee8228 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://repo.or.cz/w/wmaker-crm.git/commit/448a68c6d2812f74a83eed8da7ed7c5abb0ade1c
commit 448a68c6d2812f74a83eed8da7ed7c5abb0ade1c
Author: Rodolfo GarcÃa Peñas (kix) <[email protected]>
Date: Sun Jul 15 21:31:14 2012 +0200
get_wwindow_image_from_x11 icon resize
The icon size should be set when the icon is created. Therefore the icon
size
for net_icon_image should be set at get_wwindow_image_from_x11(), function
that
creates the image.
diff --git a/src/wmspec.c b/src/wmspec.c
index 494f55b..b416fdb 100644
--- a/src/wmspec.c
+++ b/src/wmspec.c
@@ -449,6 +449,10 @@ static RImage *get_wwindow_image_from_x11(WWindow *wwin)
image = makeRImageFromARGBData(data);
XFree(property);
+
+ /* Resize the image to the correct value */
+ image = wIconValidateIconSize(image, wPreferences.icon_size);
+
return image;
}
http://repo.or.cz/w/wmaker-crm.git/commit/af41673dbf35c663ddba82f99a34b6651060b1b1
commit af41673dbf35c663ddba82f99a34b6651060b1b1
Author: Rodolfo GarcÃa Peñas (kix) <[email protected]>
Date: Sun Jul 15 21:28:00 2012 +0200
Removed scaleDownIfNeeded function (dup code)
The function scaleDownIfNeeded's code is duplicated with the code of
wIconValidateIconSize(), then this function can be removed. The icon
size in the switchpanel should be ~48 pixels, to allow the frame around
the icon. Then, we always should resize the icon to this size. The standard
icon size is specified in WPreferences.icon_size (usually 64 pixels).
diff --git a/src/switchpanel.c b/src/switchpanel.c
index 7e3f2f3..5006bce 100644
--- a/src/switchpanel.c
+++ b/src/switchpanel.c
@@ -27,6 +27,7 @@
#include "WindowMaker.h"
#include "screen.h"
#include "framewin.h"
+#include "icon.h"
#include "window.h"
#include "defaults.h"
#include "switchpanel.h"
@@ -148,18 +149,6 @@ static void changeImage(WSwitchPanel *panel, int idecks,
int selected)
WMSetFrameRelief(icon, WRSimple);
}
-static RImage *scaleDownIfNeeded(RImage *image)
-{
- if (image && ((image->width - ICON_SIZE) > 2 || (image->height -
ICON_SIZE) > 2)) {
- RImage *nimage;
- nimage = RScaleImage(image, ICON_SIZE, (image->height *
ICON_SIZE / image->width));
- RReleaseImage(image);
- image = nimage;
- }
-
- return image;
-}
-
static void addIconForWindow(WSwitchPanel *panel, WMWidget *parent, WWindow
*wwin, int x, int y)
{
WMFrame *icon = WMCreateFrame(parent);
@@ -176,7 +165,8 @@ static void addIconForWindow(WSwitchPanel *panel, WMWidget
*parent, WWindow *wwi
if (!image)
image = wDefaultGetImage(panel->scr, wwin->wm_instance,
wwin->wm_class, ICON_TILE_SIZE);
- image = scaleDownIfNeeded(image);
+ /* We must resize the icon size (~64) to the switchpanel icon size
(~48) */
+ image = wIconValidateIconSize(image, ICON_SIZE);
WMAddToArray(panel->images, image);
WMAddToArray(panel->icons, icon);
http://repo.or.cz/w/wmaker-crm.git/commit/2e7b7b7e026e3c58c08afceab8236ea7a3cf28df
commit 2e7b7b7e026e3c58c08afceab8236ea7a3cf28df
Author: Rodolfo GarcÃa Peñas (kix) <[email protected]>
Date: Sun Jul 15 21:25:05 2012 +0200
Removed WScreen argument in wIconValidateIconSize
This patch removes the argument WScreen in wIconValidateIconSize,
because is not used.
diff --git a/src/icon.c b/src/icon.c
index 8772f2c..812301e 100644
--- a/src/icon.c
+++ b/src/icon.c
@@ -149,7 +149,7 @@ WIcon *wIconCreate(WWindow * wwin)
return icon;
}
-WIcon *wIconCreateWithIconFile(WScreen * scr, char *iconfile, int tile)
+WIcon *wIconCreateWithIconFile(WScreen *scr, char *iconfile, int tile)
{
WIcon *icon;
@@ -160,8 +160,7 @@ WIcon *wIconCreateWithIconFile(WScreen * scr, char
*iconfile, int tile)
if (!icon->file_image)
wwarning(_("error loading image file "%s": %s"),
iconfile, RMessageForError(RErrorCode));
- icon->file_image = wIconValidateIconSize(scr, icon->file_image,
wPreferences.icon_size);
-
+ icon->file_image = wIconValidateIconSize(icon->file_image,
wPreferences.icon_size);
icon->file = wstrdup(iconfile);
}
@@ -338,7 +337,7 @@ void wIconChangeTitle(WIcon * icon, char *new_title)
wIconPaint(icon);
}
-RImage *wIconValidateIconSize(WScreen *scr, RImage *icon, int max_size)
+RImage *wIconValidateIconSize(RImage *icon, int max_size)
{
RImage *nimage;
@@ -376,7 +375,7 @@ Bool wIconChangeImageFile(WIcon * icon, char *file)
path = FindImage(wPreferences.icon_path, file);
if (path && (image = RLoadImage(scr->rcontext, path, 0))) {
- icon->file_image =
wIconValidateIconSize(icon->core->screen_ptr, image, wPreferences.icon_size);
+ icon->file_image = wIconValidateIconSize(image,
wPreferences.icon_size);
wIconUpdate(icon);
} else {
error = 1;
@@ -630,7 +629,7 @@ void get_pixmap_icon_from_user_icon(WScreen *scr, WIcon *
icon)
}
}
- image = wIconValidateIconSize(scr, image,
wPreferences.icon_size);
+ image = wIconValidateIconSize(image,
wPreferences.icon_size);
scr->def_icon_pixmap = makeIcon(scr, image, False,
False, icon->tile_type, icon->highlighted);
scr->def_ticon_pixmap = makeIcon(scr, image, True,
False, icon->tile_type, icon->highlighted);
if (image)
diff --git a/src/icon.h b/src/icon.h
index 62a1844..96bb7d0 100644
--- a/src/icon.h
+++ b/src/icon.h
@@ -65,7 +65,7 @@ void wIconChangeTitle(WIcon *icon, char *new_title);
Bool wIconChangeImageFile(WIcon *icon, char *file);
-RImage * wIconValidateIconSize(WScreen *scr, RImage *icon, int max_size);
+RImage *wIconValidateIconSize(RImage *icon, int max_size);
char *wIconStore(WIcon *icon);
char *get_name_for_instance_class(char *wm_instance, char *wm_class);
diff --git a/src/wdefaults.c b/src/wdefaults.c
index 1f52d7d..497cb48 100644
--- a/src/wdefaults.c
+++ b/src/wdefaults.c
@@ -432,7 +432,7 @@ RImage *get_default_icon_rimage(WScreen *scr, char
*file_name, int max_size)
wwarning(_("error loading image file "%s": %s"), file_name,
RMessageForError(RErrorCode));
- image = wIconValidateIconSize(scr, image, max_size);
+ image = wIconValidateIconSize(image, max_size);
return image;
}
http://repo.or.cz/w/wmaker-crm.git/commit/35a2ed24ec0e2fbf968605c31c9554faf1cd4fa9
commit 35a2ed24ec0e2fbf968605c31c9554faf1cd4fa9
Author: Christophe CURIS <[email protected]>
Date: Sun Jul 15 19:12:58 2012 +0200
Fixed wrong re-generation of 'config-paths.h' file
There was a slight error in the generation of this this which led
it to grow in size everytime the Makefile is regenerated.
diff --git a/Makefile.am b/Makefile.am
index f73e6cc..f34fcd6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,6 +10,8 @@ config.h: config-paths.h
config-paths.h: Makefile
@echo "Generating $@"
+ @echo '/* this is a generated file - do not edit */' > $@
+ @echo '' >> $@
@echo '/* gettext domain used for menu translations */' >> $@
@if test -z "$(menutextdomain)"; then echo '/* #undef
MENU_TEXTDOMAIN "$(menutextdomain)" */' >> $@;
-----------------------------------------------------------------------
Summary of changes:
Makefile.am | 2 ++
src/icon.c | 11 +++++------
src/icon.h | 2 +-
src/switchpanel.c | 16 +++-------------
src/wdefaults.c | 2 +-
src/wmspec.c | 4 ++++
6 files changed, 16 insertions(+), 21 deletions(-)
repo.or.cz automatic notification. Contact project admin [email protected]
if you want to unsubscribe, or site admin [email protected] if you receive
no reply.
--
wmaker-crm.git ("The Window Maker window manager")
--
To unsubscribe, send mail to [email protected].
