KolibriOS/kolibrios
13
14
Fork 12
Code Issues 113 Pull Requests 16 Actions Projects 1 Releases Wiki Activity

kfont: remove italic style, some code cleanup in browser and lib/font.h

Browse Source 
git-svn-id: svn://kolibrios.org@6803 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Kiril Lipatov
2016-12-21 10:56:06 +00:00
parent 4ded9c23de
commit 3c1b36e8f4
12 changed files with 145 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
programs/cmm/browser/WebView.c
View File

@@ -124,7 +124,6 @@ void main()
SetSkinColors();
CreateDir("/tmp0/1/downloads");
if (param) strcpy(#URL, #param); else strcpy(#URL, URL_SERVICE_HOME);
WB1.DrawBuf.zoom = 1;
WB1.list.SetFont(8, 14, 10011000b);
WB1.list.no_selection = true;
SetEventMask(0xa7);
@@ -268,13 +267,13 @@ void SetElementSizes()
address_box.top = TOOLBAR_H/2-10;
basic_line_h = calc(WB1.list.font_h * 130) / 100;
address_box.width = Form.cwidth - address_box.left - 50;
WB1.list.SetSizes(0, TOOLBAR_H, Form.width - 10 - scroll_wv.size_x / WB1.DrawBuf.zoom,
WB1.list.SetSizes(0, TOOLBAR_H, Form.width - 10 - scroll_wv.size_x,
Form.cheight - TOOLBAR_H - STATUSBAR_H, basic_line_h);
WB1.list.wheel_size = 7 * basic_line_h;
WB1.list.column_max = WB1.list.w - scroll_wv.size_x / WB1.list.font_w;
WB1.list.visible = WB1.list.h;
if (WB1.list.w!=WB1.DrawBuf.bufw) {
WB1.DrawBuf.Init(WB1.list.x, WB1.list.y, WB1.list.w, 2048 * WB1.list.item_h);
WB1.DrawBuf.Init(WB1.list.x, WB1.list.y, WB1.list.w, 32700);
ProcessEvent(REFRESH_BUTTON);
}
}
@@ -405,9 +404,6 @@ void SetPageDefaults()
WB1.list.count = WB1.list.first = 0;
cur_encoding = CH_NULL;
if (o_bufpointer) o_bufpointer = free(o_bufpointer);
anchor_y = WB1.list.first;
//anchor[0]='|';
anchor=NULL;
}
void OpenPage()
@@ -508,6 +504,7 @@ void DrawProgress()
DrawBar(address_box.left-2, address_box.top+20, btn, 2, wv_progress_bar.progress_color);
}
char anchor[256];
void ClickLink()
{
if (http_transfer > 0)
@@ -534,7 +531,7 @@ void ClickLink()
//liner.ru#1
if (strrchr(#URL, '#')!=0)
{
strcpy(#anchor, #URL+strrchr(#URL, '#'));
strlcpy(#anchor, #URL+strrchr(#URL, '#'), sizeof(anchor));
URL[strrchr(#URL, '#')-1] = 0x00;
}