[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Stratagus-CVS] stratagus/src/ui menu_proc.c
From: |
address@hidden |
Subject: |
[Stratagus-CVS] stratagus/src/ui menu_proc.c |
Date: |
17 Dec 2003 06:47:36 +1100 |
CVSROOT: /home/strat
Module name: stratagus
Changes by: <address@hidden> 03/12/17 06:47:35
Modified files:
src/ui : menu_proc.c
Log message:
Fixed tabs
Patches:
Index: stratagus/src/ui/menu_proc.c
diff -u stratagus/src/ui/menu_proc.c:1.116 stratagus/src/ui/menu_proc.c:1.117
--- stratagus/src/ui/menu_proc.c:1.116 Wed Dec 17 00:31:33 2003
+++ stratagus/src/ui/menu_proc.c Wed Dec 17 06:47:35 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: menu_proc.c,v 1.116 2003/12/16 13:31:33 mohydine Exp $
+// $Id: menu_proc.c,v 1.117 2003/12/16 19:47:35 jsalmon3 Exp $
//@{
@@ -511,9 +511,9 @@
PushClipping();
SetClipping(0, 0, x + w, VideoHeight - 1);
if (mi->transparent) {
- VideoDrawClipTrans50(MenuButtonGfx.Sprite, rb, x - 1, y - 1 +
oh * i);
+ VideoDrawClipTrans50(MenuButtonGfx.Sprite, rb, x - 1, y - 1
+ oh * i);
} else {
- VideoDrawClip(MenuButtonGfx.Sprite, rb, x - 1, y - 1 + oh * i);
+ VideoDrawClip(MenuButtonGfx.Sprite, rb, x - 1, y - 1 + oh *
i);
}
PopClipping();
text = mi->d.pulldown.options[i];
@@ -546,11 +546,11 @@
} else {
SetClipping(0, 0, x + w - 1, VideoHeight - 1);
}
- if (mi->transparent) {
- VideoDrawClipTrans50(MenuButtonGfx.Sprite, rb, x - 1, y - 1);
- } else {
+ if (mi->transparent) {
+ VideoDrawClipTrans50(MenuButtonGfx.Sprite, rb, x - 1, y - 1);
+ } else {
VideoDrawClip(MenuButtonGfx.Sprite, rb, x - 1, y - 1);
- }
+ }
PopClipping();
if (!(mi->d.pulldown.state & MI_PSTATE_PASSIVE)) {
VideoDraw(MenuButtonGfx.Sprite, MBUTTON_DOWN_ARROW + rb -
MBUTTON_PULLDOWN,
@@ -621,9 +621,9 @@
PushClipping();
SetClipping(0, 0, x + w, VideoHeight - 1);
if (mi->transparent) {
- VideoDrawClipTrans50(MenuButtonGfx.Sprite, rb, x - 1, y - 1 + 18 * i);
+ VideoDrawClipTrans50(MenuButtonGfx.Sprite, rb, x - 1, y - 1 + 18 *
i);
} else {
- VideoDrawClip(MenuButtonGfx.Sprite, rb, x - 1, y - 1 + 18 * i);
+ VideoDrawClip(MenuButtonGfx.Sprite, rb, x - 1, y - 1 + 18 * i);
}
PopClipping();
if (!(flags & MenuButtonDisabled)) {
@@ -710,26 +710,26 @@
if (flags & MenuButtonDisabled) {
PushClipping();
SetClipping(0, 0, VideoWidth - 1, y + h - 20);
- if (mi->transparent) {
- VideoDrawClipTrans50(MenuButtonGfx.Sprite, MBUTTON_S_VCONT - 1, x,
y - 2);
- VideoDrawClipTrans50(MenuButtonGfx.Sprite, MBUTTON_S_VCONT - 1, x,
y + h / 2);
- } else {
+ if (mi->transparent) {
+ VideoDrawClipTrans50(MenuButtonGfx.Sprite, MBUTTON_S_VCONT - 1,
x, y - 2);
+ VideoDrawClipTrans50(MenuButtonGfx.Sprite, MBUTTON_S_VCONT - 1,
x, y + h / 2);
+ } else {
VideoDrawClip(MenuButtonGfx.Sprite, MBUTTON_S_VCONT - 1, x, y -
2);
- VideoDrawClip(MenuButtonGfx.Sprite, MBUTTON_S_VCONT - 1, x, y + h /
2);
- }
+ VideoDrawClip(MenuButtonGfx.Sprite, MBUTTON_S_VCONT - 1, x, y +
h / 2);
+ }
PopClipping();
VideoDraw(MenuButtonGfx.Sprite, MBUTTON_UP_ARROW - 1, x, y - 2);
VideoDraw(MenuButtonGfx.Sprite, MBUTTON_DOWN_ARROW - 1, x, y + h -
20);
} else {
PushClipping();
SetClipping(0, 0, VideoWidth - 1, y + h - 20);
- if (mi->transparent) {
- VideoDrawClipTrans50(MenuButtonGfx.Sprite, MBUTTON_S_VCONT, x, y -
2);
- VideoDrawClipTrans50(MenuButtonGfx.Sprite, MBUTTON_S_VCONT, x, y +
h / 2);
- } else {
+ if (mi->transparent) {
+ VideoDrawClipTrans50(MenuButtonGfx.Sprite, MBUTTON_S_VCONT, x,
y - 2);
+ VideoDrawClipTrans50(MenuButtonGfx.Sprite, MBUTTON_S_VCONT, x,
y + h / 2);
+ } else {
VideoDrawClip(MenuButtonGfx.Sprite, MBUTTON_S_VCONT, x, y - 2);
- VideoDrawClip(MenuButtonGfx.Sprite, MBUTTON_S_VCONT, x, y + h / 2);
- }
+ VideoDrawClip(MenuButtonGfx.Sprite, MBUTTON_S_VCONT, x, y + h /
2);
+ }
PopClipping();
if (mi->d.vslider.cflags & MI_CFLAGS_UP) {
VideoDraw(MenuButtonGfx.Sprite, MBUTTON_UP_ARROW + 1, x, y - 2);
@@ -813,26 +813,26 @@
if (flags & MenuButtonDisabled) {
PushClipping();
SetClipping(0, 0, x + w - 20, VideoHeight - 1);
- if (mi->transparent) {
- VideoDrawClipTrans50(MenuButtonGfx.Sprite, MBUTTON_S_HCONT - 1, x -
2, y);
- VideoDrawClipTrans50(MenuButtonGfx.Sprite, MBUTTON_S_HCONT - 1, x +
w / 2, y);
- } else {
+ if (mi->transparent) {
+ VideoDrawClipTrans50(MenuButtonGfx.Sprite, MBUTTON_S_HCONT - 1,
x - 2, y);
+ VideoDrawClipTrans50(MenuButtonGfx.Sprite, MBUTTON_S_HCONT - 1,
x + w / 2, y);
+ } else {
VideoDrawClip(MenuButtonGfx.Sprite, MBUTTON_S_HCONT - 1, x - 2,
y);
- VideoDrawClip(MenuButtonGfx.Sprite, MBUTTON_S_HCONT - 1, x + w / 2,
y);
- }
+ VideoDrawClip(MenuButtonGfx.Sprite, MBUTTON_S_HCONT - 1, x + w
/ 2, y);
+ }
PopClipping();
VideoDraw(MenuButtonGfx.Sprite, MBUTTON_LEFT_ARROW - 1, x - 2, y);
VideoDraw(MenuButtonGfx.Sprite, MBUTTON_RIGHT_ARROW - 1, x + w -
20, y);
} else {
PushClipping();
SetClipping(0, 0, x + w - 20, VideoHeight - 1);
- if (mi->transparent) {
+ if (mi->transparent) {
VideoDrawClipTrans50(MenuButtonGfx.Sprite, MBUTTON_S_HCONT, x -
2, y);
VideoDrawClipTrans50(MenuButtonGfx.Sprite, MBUTTON_S_HCONT, x +
w / 2, y);
- } else {
+ } else {
VideoDrawClip(MenuButtonGfx.Sprite, MBUTTON_S_HCONT, x - 2, y);
VideoDrawClip(MenuButtonGfx.Sprite, MBUTTON_S_HCONT, x + w / 2,
y);
- }
+ }
PopClipping();
if (mi->d.hslider.cflags & MI_CFLAGS_LEFT) {
VideoDraw(MenuButtonGfx.Sprite, MBUTTON_LEFT_ARROW + 1, x - 2,
y);
@@ -978,9 +978,9 @@
PushClipping();
SetClipping(0, 0, x + w, VideoHeight - 1);
if (mi->transparent) {
- VideoDrawClipTrans50(MenuButtonGfx.Sprite, rb, x - 1, y - 1);
+ VideoDrawClipTrans50(MenuButtonGfx.Sprite, rb, x - 1, y - 1);
} else {
- VideoDrawClip(MenuButtonGfx.Sprite, rb, x - 1, y - 1);
+ VideoDrawClip(MenuButtonGfx.Sprite, rb, x - 1, y - 1);
}
PopClipping();
text = mi->d.input.buffer;
- [Stratagus-CVS] stratagus/src/ui menu_proc.c,
address@hidden <=