Aren/kolibrios
1
0
Fork 0
mirror of https://github.com/KolibriOS/kolibrios.git synced 2024-11-24 17:59:38 +03:00
Code Issues Packages Projects Releases Wiki Activity

htmlv 0.68: <font color="something unreal"> bug fixed

Browse Source 
git-svn-id: svn://kolibrios.org@2152 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Kirill Lipatov (Leency) 2011-09-04 16:13:26 +00:00
parent 81a07b7206
commit 5dbc9f7f7c
4 changed files with 29 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
programs/network/htmlv/browser/HTMLv.c--
View File

@ -131,8 +131,8 @@ void Draw_Window()
DrawBar(0,43,onLeft(5,4),1,0xD2CED0); //âûïóêëîñòü
FOR (j=0; j<5; j++) DefineButton(j*37+11, 7, 29, 29, 300+j+BT_HIDE, 0x00E4DFE1);
PutImage(#URLgoto,40,19,onLeft(57,0),14);
DefineButton(onLeft(38,0),14, 20, 18, GOTOURL+BT_HIDE, 0xE4DFE1);
DefineButton(onLeft(57,0),14, 19, 18, SEARCHWEB+BT_HIDE, 0xE4DFE1);
DefineButton(onLeft(37,0),15, 18, 16, GOTOURL+BT_HIDE, 0xE4DFE1);
DefineButton(onLeft(56,0),15, 17, 16, SEARCHWEB+BT_HIDE, 0xE4DFE1);
DrawRegion_3D(205,14,onLeft(58,205),18,0x94AECE,0x94AECE); //îáîäîê ïîëîñû àäðåñà
DrawRegion_3D(206,15,onLeft(59,205),16,0xE4ECF3,0xE4ECF3);
edit1.width=Form.width-266;

3
programs/network/htmlv/browser/History.txt
View File

@ -1,3 +1,6 @@
04.09.11 -- v0.68 -- 11.1 Кб
- устранён вылет программы при неправильном параметре color тега <font> - алсо иногда действительно полезно читать маны.
20.08.11 -- v0.67 -- 11.1 Кб
- более адекватная прокрутка изображений;
- корректная обработка табов в тексте и с тегом <pre> (спасибо Nazarus и Jaeger);

34
programs/network/htmlv/browser/TWB.h--
View File

@ -17,7 +17,7 @@ dword j,
char download_path[]="/rd/1/.download";
//char search_path[]="http://nova.rambler.ru/search?words=";
char search_path[]="http://nigma.ru/index.php?s=";
char version[]=" Text-based Browser 23.67";
char version[]=" Text-based Browser 23.68";
struct TWebBrowser {
@ -513,19 +513,29 @@ void TWebBrowser::WhatTextStyle(int left1, top1, width1) {
return;
}
/////////////////////////
if (!chTag("font")) {
IF(stroka <= 0) && (stroka - 1 > max_kolvo_strok) return;
COL_MARK: IF(strcmp(#parametr, "color=") == 0) //&& (parametr[1] == '#')
if (!chTag("font"))
{
IF(stroka < 0) || (stroka - 1 > max_kolvo_strok) return;
COL_MARK:
if (strcmp(#parametr, "color=") == 0) //&& (parametr[1] == '#')
{
text_color_index++;
IF (options[0] == '#'){
text_colors[text_color_index] = StrToCol(#options);
text_color_index++;
IF (options[0] == '#')
{
text_colors[text_color_index] = StrToCol(#options);
}
ELSE
{
FOR (i=0; color_names[i]!=0; i++)
{
IF(!strcmp(#options, color_names[i]))
{
text_colors[text_color_index] = colors[i];
BREAK;
}
text_colors[text_color_index] = text_colors[0];
}
}
ELSE {
FOR (i=0;color_names[i]!=0;i++){
IF(!strcmp(#options, color_names[i])) {text_colors[text_color_index] = colors[i]; BREAK;}
}
}
}
IF(tagparam[0] <>'') {

3
programs/network/htmlv/browser/include/colors.h--
View File

@ -142,7 +142,8 @@ char *color_names[]={
"white",
"whitesmoke",
"yellow",
"yellowgreen"};
"yellowgreen",
0};
//соответствующие им значения
dword *colors[]={