From 7909ce73042e51f05e4075037f8d2848f643a74f Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Mon, 4 May 2009 20:24:13 +0000 Subject: [PATCH] Made RGB scaler a bit larger in palette secondary screen. git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@774 416bcca6-2ee7-4201-b75f-2eb2f807beb1 --- palette.c | 2 +- text.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/palette.c b/palette.c index 6f3b9672..4e01285c 100644 --- a/palette.c +++ b/palette.c @@ -2146,7 +2146,7 @@ void Button_Secondary_palette(void) Num2str(Config.Palette_cells_Y,str,3); Print_in_window(94,89,str,MC_Black,MC_Light); - rgb_scale_slider = Window_set_scroller_button(137,73,29,254,1,256-RGB_scale);// 7 + rgb_scale_slider = Window_set_scroller_button(137,58,60,254,1,256-RGB_scale);// 7 Num2str(RGB_scale,str,3); Print_in_window(157,89,str,MC_Black,MC_Light); diff --git a/text.c b/text.c index 0f49d2a7..19a69273 100644 --- a/text.c +++ b/text.c @@ -30,14 +30,14 @@ // TrueType #ifndef NOTTF -#ifdef __macosx__ +#if defined(__macosx__) #include #else #include #endif -#ifdef __linux__ -#ifdef __macosx__ +#if defined(__linux__) +#if defined(__macosx__) #include #import #import @@ -95,7 +95,7 @@ void Add_font(const char *name) // Détermination du type: -#ifdef __macosx__ +#if defined(__macosx__) if (size < 6) return; @@ -141,7 +141,7 @@ void Add_font(const char *name) font->Is_bitmap = 1; break; default: - #ifdef __macosx__ + #if defined(__macosx__) if(strcasecmp(&name[size-6], "dfont") == 0) { font->Is_truetype = 1; @@ -285,7 +285,7 @@ void Init_text(void) strcat(directory_name, "fonts"); For_each_file(directory_name, Add_font); - #ifdef __WIN32__ + #if defined(__WIN32__) // Parcours du répertoire systeme windows "fonts" #ifndef NOTTF {