nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'backport' into work

Browse source 
Conflicts:

	openbox/frame.c
This commit is contained in:
Dana Jansens 2010-01-14 16:19:57 -05:00
commit 3bd4397b6e
4 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
data/xsession/openbox-gnome-session.in
View file

@ -37,7 +37,7 @@ else
if test -z "$SESSION"; then if test -z "$SESSION"; then
# if its empty then just run openbox # if its empty then just run openbox
SESSION="[openbox]" SESSION="[openbox]"
elif test -z $(echo "$SESSION" | grep -q openbox); then elif echo "$SESSION" | grep -q openbox; then
# if openbox isn't in the session then append it # if openbox isn't in the session then append it
SESSION="${SESSION%]},openbox]" SESSION="${SESSION%]},openbox]"
fi fi

2
obrender/image.c
View file

@ -532,7 +532,9 @@ void RrImageDrawImage(RrPixel32 *target, RrTextureImage *img,
/* our size difference metric.. */ /* our size difference metric.. */
wdiff = self->original[i]->width - area->width; wdiff = self->original[i]->width - area->width;
if (wdiff < 0) wdiff *= 2; /* prefer scaling down than up */
hdiff = self->original[i]->height - area->height; hdiff = self->original[i]->height - area->height;
if (hdiff < 0) hdiff *= 2; /* prefer scaling down than up */
diff = (wdiff * wdiff) + (hdiff * hdiff); diff = (wdiff * wdiff) + (hdiff * hdiff);
/* find the smallest difference */ /* find the smallest difference */

6
openbox/frame.c
View file

@ -861,10 +861,12 @@ void frame_adjust_area(ObFrame *self, gboolean moved,
if (focus_cycle_target == self->client) if (focus_cycle_target == self->client)
focus_cycle_update_indicator(self->client); focus_cycle_update_indicator(self->client);
} }
if (resized && (self->decorations & OB_FRAME_DECOR_TITLEBAR)) if (resized && (self->decorations & OB_FRAME_DECOR_TITLEBAR) &&
self->label_width)
{
XResizeWindow(obt_display, self->label, self->label_width, XResizeWindow(obt_display, self->label, self->label_width,
ob_rr_theme->label_height); ob_rr_theme->label_height);
}
} }
static void frame_adjust_cursors(ObFrame *self) static void frame_adjust_cursors(ObFrame *self)

6
po/hu.po
View file

@ -8,8 +8,8 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: openbox 3.4.10\n" "Project-Id-Version: openbox 3.4.10\n"
"Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n" "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
"POT-Creation-Date: 2010-01-08 22:39+0100\n" "POT-Creation-Date: 2010-01-07 14:19-0500\n"
"PO-Revision-Date: 2010-01-08 22:23+0100\n" "PO-Revision-Date: 2010-01-14 11:04+0100\n"
"Last-Translator: Laszlo Dvornik <dvornik@gnome.hu>\n" "Last-Translator: Laszlo Dvornik <dvornik@gnome.hu>\n"
"Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n" "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
@ -49,7 +49,7 @@ msgstr "Kilépés"
#: openbox/actions/exit.c:67 #: openbox/actions/exit.c:67
msgid "Are you sure you want to log out?" msgid "Are you sure you want to log out?"
msgstr "Biztos, hogy ki akarsz jelentkezni?" msgstr "Biztos ki akar jelentkezni?"
#: openbox/actions/exit.c:68 #: openbox/actions/exit.c:68
msgid "Log Out" msgid "Log Out"