[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Wesnoth-cvs-commits] wesnoth/src font.cpp font.hpp show_dialog.cpp
From: |
Jordà Polo |
Subject: |
[Wesnoth-cvs-commits] wesnoth/src font.cpp font.hpp show_dialog.cpp |
Date: |
Thu, 26 Aug 2004 17:00:40 -0400 |
CVSROOT: /cvsroot/wesnoth
Module name: wesnoth
Branch:
Changes by: Jordà Polo <address@hidden> 04/08/26 20:56:03
Modified files:
src : font.cpp font.hpp show_dialog.cpp
Log message:
title changes
* size: 18px
* color: #BCB088
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/font.cpp.diff?tr1=1.81&tr2=1.82&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/font.hpp.diff?tr1=1.37&tr2=1.38&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/show_dialog.cpp.diff?tr1=1.89&tr2=1.90&r1=text&r2=text
Patches:
Index: wesnoth/src/font.cpp
diff -u wesnoth/src/font.cpp:1.81 wesnoth/src/font.cpp:1.82
--- wesnoth/src/font.cpp:1.81 Wed Aug 25 02:59:51 2004
+++ wesnoth/src/font.cpp Thu Aug 26 20:56:03 2004
@@ -1,4 +1,4 @@
-/* $Id: font.cpp,v 1.81 2004/08/25 02:59:51 Sirp Exp $ */
+/* $Id: font.cpp,v 1.82 2004/08/26 20:56:03 ettin Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -170,7 +170,8 @@
BLACK_COLOUR = {0x00,0x00,0x00,0},
DARK_COLOUR = {0x00,0x00,0x66,0},
YELLOW_COLOUR = {0xFF,0xFF,0x00,0},
- BUTTON_COLOUR = {0xBC,0xB0,0x88,0};
+ BUTTON_COLOUR = {0xBC,0xB0,0x88,0},
+ TITLE_COLOUR = {0xBC,0xB0,0x88,0};
const char LARGE_TEXT='*', SMALL_TEXT='`', GOOD_TEXT='@', BAD_TEXT='#',
NORMAL_TEXT='{', BLACK_TEXT='}', BOLD_TEXT='~', IMAGE='&',
NULL_MARKUP='^';
Index: wesnoth/src/font.hpp
diff -u wesnoth/src/font.hpp:1.37 wesnoth/src/font.hpp:1.38
--- wesnoth/src/font.hpp:1.37 Mon Aug 16 14:17:19 2004
+++ wesnoth/src/font.hpp Thu Aug 26 20:56:03 2004
@@ -1,4 +1,4 @@
-/* $Id: font.hpp,v 1.37 2004/08/16 14:17:19 erl Exp $ */
+/* $Id: font.hpp,v 1.38 2004/08/26 20:56:03 ettin Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -35,7 +35,7 @@
//various standard colours
extern const SDL_Color NORMAL_COLOUR, GOOD_COLOUR, BAD_COLOUR, BLACK_COLOUR,
- DARK_COLOUR, YELLOW_COLOUR, BUTTON_COLOUR;
+ DARK_COLOUR, YELLOW_COLOUR, BUTTON_COLOUR, TITLE_COLOUR;
enum MARKUP { USE_MARKUP, NO_MARKUP };
Index: wesnoth/src/show_dialog.cpp
diff -u wesnoth/src/show_dialog.cpp:1.89 wesnoth/src/show_dialog.cpp:1.90
--- wesnoth/src/show_dialog.cpp:1.89 Wed Aug 25 21:27:33 2004
+++ wesnoth/src/show_dialog.cpp Thu Aug 26 20:56:03 2004
@@ -1,4 +1,4 @@
-/* $Id: show_dialog.cpp,v 1.89 2004/08/25 21:27:33 isaaccp Exp $ */
+/* $Id: show_dialog.cpp,v 1.90 2004/08/26 20:56:03 ettin Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -180,7 +180,7 @@
rect = disp->screen_area();
}
- return
font::draw_text(disp,rect,24,font::NORMAL_COLOUR,text,x+5,y+5,NULL,false,font::USE_MARKUP,TTF_STYLE_BOLD);
+ return
font::draw_text(disp,rect,18,font::TITLE_COLOUR,text,x+5,y+5,NULL,false,font::USE_MARKUP,TTF_STYLE_BOLD);
}
void draw_dialog(int x, int y, int w, int h, display& disp, const std::string&
title,
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Wesnoth-cvs-commits] wesnoth/src font.cpp font.hpp show_dialog.cpp,
Jordà Polo <=