Commit 2057de4a authored by Emmanuel Puig's avatar Emmanuel Puig

* Ask tooney to know ! (fix minor bug)

parent d17b6f1c
......@@ -2,7 +2,7 @@
* playlist.cpp: Playlist control
*****************************************************************************
* Copyright (C) 2003 VideoLAN
* $Id: playlist.cpp,v 1.2 2003/04/16 21:40:07 ipkiss Exp $
* $Id: playlist.cpp,v 1.3 2003/04/17 19:56:31 karibu Exp $
*
* Authors: Olivier Teulire <ipkiss@via.ecp.fr>
* Emmanuel Puig <karibu@via.ecp.fr>
......@@ -328,21 +328,21 @@ void ControlPlayList::DrawCase( Graphics *dest, int i, int x, int y, int w,
F->Print( dest,
Num,
CaseTextLeft[j] - x, TextTop + j * CaseHeight - y,
NumWidth - Margin, CaseHeight, DT_RIGHT );
NumWidth - Margin, CaseHeight, VLC_FONT_ALIGN_RIGHT );
// Print name
F->Print( dest,
GetFileName( i ),
NumWidth + Margin + CaseTextLeft[j] - x,
TextTop + j * CaseHeight - y,
FileWidth - 2 * Margin, CaseHeight, DT_LEFT );
FileWidth - 2 * Margin, CaseHeight, VLC_FONT_ALIGN_LEFT );
// Print info
F->Print( dest,
"no info",
NumWidth + FileWidth + Margin + CaseTextLeft[j] - x,
TextTop + j * CaseHeight - y,
InfoWidth - Margin, CaseHeight, DT_CENTER );
InfoWidth - Margin, CaseHeight, VLC_FONT_ALIGN_CENTER );
}
//---------------------------------------------------------------------------
char * ControlPlayList::GetFileName( int i )
......
......@@ -2,7 +2,7 @@
* text.cpp: Text control
*****************************************************************************
* Copyright (C) 2003 VideoLAN
* $Id: text.cpp,v 1.5 2003/04/17 16:34:31 karibu Exp $
* $Id: text.cpp,v 1.6 2003/04/17 19:56:31 karibu Exp $
*
* Authors: Olivier Teulire <ipkiss@via.ecp.fr>
* Emmanuel Puig <karibu@via.ecp.fr>
......@@ -34,6 +34,7 @@
#include "../src/graphics.h"
#include "../os_graphics.h"
#include "../src/font.h"
#include "../os_font.h"
#include "generic.h"
#include "text.h"
#include "../src/event.h"
......@@ -210,12 +211,12 @@ void ControlText::SetSize()
Height = h;
// Set position wether alignment
if( Align == DT_CENTER )
if( Align == VLC_FONT_ALIGN_CENTER )
{
Left = InitLeft - Width / 2;
TextLeft = InitLeft - TextWidth / 2;
}
else if( Align == DT_RIGHT )
else if( Align == VLC_FONT_ALIGN_RIGHT )
{
Left = InitLeft - Width;
TextLeft = InitLeft - TextWidth;
......
......@@ -2,7 +2,7 @@
* font.h: Font class
*****************************************************************************
* Copyright (C) 2003 VideoLAN
* $Id: font.h,v 1.2 2003/04/12 21:43:27 asmax Exp $
* $Id: font.h,v 1.3 2003/04/17 19:56:31 karibu Exp $
*
* Authors: Olivier Teulière <ipkiss@via.ecp.fr>
* Emmanuel Puig <karibu@via.ecp.fr>
......@@ -31,12 +31,6 @@
#include <string>
using namespace std;
/* FIXME :kludge */
#define DT_TOP 0 // 0x0000
#define DT_LEFT 0 // 0x0000
#define DT_CENTER 1 // 0x0001
#define DT_RIGHT 2 // 0x0002
//---------------------------------------------------------------------------
struct intf_thread_t;
class Graphics;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment