diff --git a/data/images/title-tuxpaint-2x.png b/data/images/title-tuxpaint-2x.png new file mode 100644 index 000000000..86a981aea Binary files /dev/null and b/data/images/title-tuxpaint-2x.png differ diff --git a/data/images/title-tuxpaint.png b/data/images/title-tuxpaint.png index ba82997f2..5188a32df 100644 Binary files a/data/images/title-tuxpaint.png and b/data/images/title-tuxpaint.png differ diff --git a/data/images/title-tuxpaint.svg b/data/images/title-tuxpaint.svg new file mode 100644 index 000000000..d9f9f80a6 --- /dev/null +++ b/data/images/title-tuxpaint.svg @@ -0,0 +1,91 @@ + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + diff --git a/docs/CHANGES.txt b/docs/CHANGES.txt index 1fcfed773..f889ca8cd 100644 --- a/docs/CHANGES.txt +++ b/docs/CHANGES.txt @@ -9,7 +9,7 @@ http://www.tuxpaint.org/ $Id$ -2008.February.24 (0.9.19) +2008.February.25 (0.9.19) * New Localizations: ------------------ * Australian English @@ -78,7 +78,8 @@ $Id$ * Added "--allowscreensaver" option, which prevents Tux Paint from disabling the screensaver or monitor power management while running. (Requires SDL 1.2.12; can also be done by setting the - SDL_VIDEO_ALLOW_SCREENSAVER environment variable to '1' before running Tux Paint.) + SDL_VIDEO_ALLOW_SCREENSAVER environment variable to '1' before running + Tux Paint.) * Removed unfinished, unused record and playback code. @@ -115,6 +116,13 @@ $Id$ Carlo Gandolfi Douglas Barbieri + * Other improvements: + ------------------- + * Recreated "Tux Paint" title art using Inkscape (traced original bitmap). + + * Larger "Tux Paint" title art displayed on larger screens. + + * Bug Fixes --------- * Added authorization code to permit Fontconfig files @@ -139,7 +147,8 @@ $Id$ after 40 flips or mirrors, which in turn caused a crash on startup. John Popplewell - * Fixed bug that prevented rendering of some locales on Mac OS X (e.g. Arabic) + * Fixed bug that prevented rendering of some locales on Mac OS X + (e.g. Arabic) Martin Fuhrer diff --git a/src/tuxpaint.c b/src/tuxpaint.c index 28a47bd93..ba9091a67 100644 --- a/src/tuxpaint.c +++ b/src/tuxpaint.c @@ -6035,6 +6035,7 @@ static void setup(int argc, char *argv[]) Uint32(*getpixel_tmp_btn_up) (SDL_Surface *, int, int); Uint32(*getpixel_tmp_btn_down) (SDL_Surface *, int, int); Uint32(*getpixel_img_paintwell) (SDL_Surface *, int, int); + int big_title; @@ -7165,10 +7166,20 @@ static void setup(int argc, char *argv[]) ////////// quickly: title image, version, progress bar, and watch cursor img_title = loadimage(DATA_PREFIX "images/title.png"); - img_title_tuxpaint = loadimage(DATA_PREFIX "images/title-tuxpaint.png"); img_title_credits = loadimage(DATA_PREFIX "images/title-credits.png"); img_progress = loadimage(DATA_PREFIX "images/ui/progress.png"); + if (screen->w - img_title->w >= 410 && screen->h - img_progress->h - img_title_credits->h - 40) /* FIXME: Font */ + big_title = 1; + else + big_title = 0; + + + if (big_title) + img_title_tuxpaint = loadimage(DATA_PREFIX "images/title-tuxpaint-2x.png"); + else + img_title_tuxpaint = loadimage(DATA_PREFIX "images/title-tuxpaint.png"); + SDL_FillRect(screen, NULL, SDL_MapRGB(screen->format, 255, 255, 255)); dest.x = @@ -7179,7 +7190,10 @@ static void setup(int argc, char *argv[]) SDL_BlitSurface(img_title, NULL, screen, &dest); dest.x = 10; - dest.y = (WINDOW_HEIGHT - img_title->h) + img_title_tuxpaint->h * 0.8 + 7; + if (big_title) + dest.y = WINDOW_HEIGHT - img_title_tuxpaint->h - img_progress->h - 40; + else + dest.y = (WINDOW_HEIGHT - img_title->h) + img_title_tuxpaint->h * 0.8 + 7; SDL_BlitSurface(img_title_tuxpaint, NULL, screen, &dest);