From ab5628b57deb9adf67ddb2c557136aac5f305ebb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Minisini?= Date: Tue, 5 Jan 2016 01:29:13 +0000 Subject: [PATCH] [GB.WEB.FORM] * BUG: WebTable: Cell foreground color is correctly taken into account. git-svn-id: svn://localhost/gambas/trunk@7552 867c0c6c-44f3-4631-809d-bfa615b0a4ec --- comp/src/gb.web.form/.project | 2 +- comp/src/gb.web.form/.src/Main.module | 3 ++- comp/src/gb.web.form/.src/WebTable/WebTable.class | 2 +- comp/src/gb.web.form/.startup | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/comp/src/gb.web.form/.project b/comp/src/gb.web.form/.project index a9328efe4..9e805850e 100644 --- a/comp/src/gb.web.form/.project +++ b/comp/src/gb.web.form/.project @@ -1,6 +1,6 @@ # Gambas Project File 3.0 # Compiled with Gambas 3.8.90 -Startup=Webform2 +Startup=Main UseHttpServer=1 Version=3.8.90 VersionFile=1 diff --git a/comp/src/gb.web.form/.src/Main.module b/comp/src/gb.web.form/.src/Main.module index dae59ed5f..914c58fc6 100644 --- a/comp/src/gb.web.form/.src/Main.module +++ b/comp/src/gb.web.form/.src/Main.module @@ -4,7 +4,8 @@ Public Sub Main() - Debug Base64(File.Load("arrow-right.png")) + 'Debug Base64(File.Load("arrow-right.png")) + Debug WebForm._GetColor(Color.Gray) End diff --git a/comp/src/gb.web.form/.src/WebTable/WebTable.class b/comp/src/gb.web.form/.src/WebTable/WebTable.class index c53bc6e79..f473cd5d6 100644 --- a/comp/src/gb.web.form/.src/WebTable/WebTable.class +++ b/comp/src/gb.web.form/.src/WebTable/WebTable.class @@ -78,7 +78,7 @@ Public Sub _Render() hCol._PrintAlignment() sStyle = "" If hData.Background <> Color.Default Then sStyle &= "background-color:" & WebControl._GetColor(hData.Background) & ";" - If hData.Foreground <> Color.Default Then sStyle &= "color:" & WebControl._GetColor(hData.Background) & ";" + If hData.Foreground <> Color.Default Then sStyle &= "color:" & WebControl._GetColor(hData.Foreground) & ";" If sStyle Then Print " style=\""; sStyle; "\""; Print ">"; If hData.Html Then diff --git a/comp/src/gb.web.form/.startup b/comp/src/gb.web.form/.startup index 1fdb77c9c..8c36387dc 100644 --- a/comp/src/gb.web.form/.startup +++ b/comp/src/gb.web.form/.startup @@ -1,4 +1,4 @@ -Webform2 +Main 0 0