[Scummvm-cvs-logs] CVS: scummvm/gui TabWidget.cpp,1.3,1.4 newgui.cpp,1.64,1.65
Max Horn
fingolfin at users.sourceforge.net
Sun Nov 2 17:15:20 CET 2003
Update of /cvsroot/scummvm/scummvm/gui
In directory sc8-pr-cvs1:/tmp/cvs-serv13975
Modified Files:
TabWidget.cpp newgui.cpp
Log Message:
distinguish selected tab by size, too (not just by color)
Index: TabWidget.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/TabWidget.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- TabWidget.cpp 3 Nov 2003 00:18:33 -0000 1.3
+++ TabWidget.cpp 3 Nov 2003 01:14:40 -0000 1.4
@@ -25,7 +25,7 @@
#include "gui/newgui.h"
enum {
- kTabHeight = 14,
+ kTabHeight = 15,
kTabLeftOffset = 4,
kTabSpacing = 2,
@@ -115,8 +115,9 @@
int i, x = _x + kTabLeftOffset;
for (i = 0; i < _tabs.size(); ++i) {
NewGuiColor color = (i == _activeTab) ? gui->_color : gui->_shadowcolor;
- gui->box(x, _y, _tabWidth, kTabHeight, color, color);
- gui->drawString(_tabs[i].title, x + kTabPadding, _y + 4, _tabWidth - 2 * kTabPadding, gui->_textcolor, kTextAlignCenter);
+ int yOffset = (i == _activeTab) ? 0 : 2;
+ gui->box(x, _y + yOffset, _tabWidth, kTabHeight - yOffset, color, color);
+ gui->drawString(_tabs[i].title, x + kTabPadding, _y + yOffset/2 + 4, _tabWidth - 2 * kTabPadding, gui->_textcolor, kTextAlignCenter);
x += _tabWidth + kTabSpacing;
}
Index: newgui.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/newgui.cpp,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -d -r1.64 -r1.65
--- newgui.cpp 2 Nov 2003 18:57:20 -0000 1.64
+++ newgui.cpp 3 Nov 2003 01:14:40 -0000 1.65
@@ -324,7 +324,7 @@
void NewGui::blendRect(int x, int y, int w, int h, NewGuiColor color, int level) {
#ifdef NEWGUI_256
- fillRect(x,y,w,h,color);
+ fillRect(x, y, w, h, color);
#else
int r, g, b;
uint8 ar, ag, ab;
More information about the Scummvm-git-logs
mailing list