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

WebView 1.14: remove Zoom2x function, use system fonts

Browse Source 
git-svn-id: svn://kolibrios.org@5678 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Kiril Lipatov
2015-08-04 22:21:08 +00:00
parent 872ac43496
commit b004b5af85
5 changed files with 48 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
programs/cmm/lib/draw_buf.h
View File

@@ -7,13 +7,11 @@
#endif
dword buf_data;
dword zbuf_data;
struct DrawBufer {
int bufx, bufy, bufw, bufh;
int zbufx, zbufy, zbufw, zbufh;
byte zoomf;
byte zoom;
void Init();
void Show();
@@ -23,31 +21,18 @@ struct DrawBufer {
void PutPixel();
void AlignCenter();
void AlignRight();
void Zoom2x();
};
void DrawBufer::Init(int i_bufx, i_bufy, i_bufw, i_bufh)
{
bufx = i_bufx;
bufy = i_bufy;
bufw = i_bufw;
bufh = i_bufh;
bufw = i_bufw * zoom;
bufh = i_bufh * zoom;
free(buf_data);
buf_data = malloc(bufw * bufh * 4 + 8);
ESDWORD[buf_data] = bufw;
ESDWORD[buf_data+4] = bufh;
if (zoomf != 1)
{
zbufx = bufx;
zbufy = bufy;
zbufw = bufw * zoomf;
zbufh = bufh * zoomf;
free(zbuf_data);
zbuf_data = malloc(zbufw * zbufh * 4 + 8);
ESDWORD[zbuf_data] = zbufw;
ESDWORD[zbuf_data+4] = zbufh;
}
}
void DrawBufer::Fill(dword fill_color)
@@ -109,7 +94,7 @@ void DrawBufer::AlignCenter(dword x,y,w,h, content_width)
}
}
/*
void DrawBufer::Zoom2x()
{
int i, s;
@@ -117,7 +102,7 @@ void DrawBufer::Zoom2x()
point_x = 0;
max_i = bufw * bufh * 4 + buf_data+8;
s_inc = zoomf * 4;
s_inc = zoom * 4;
zline_w = zbufw * 4;
for (i=buf_data+8, s=zbuf_data+8; i<max_i; i+=4, s+= s_inc) {
@@ -125,7 +110,7 @@ void DrawBufer::Zoom2x()
ESDWORD[s+4] = ESDWORD[i];
ESDWORD[s+zline_w] = ESDWORD[i];
ESDWORD[s+zline_w+4] = ESDWORD[i];
if (zoomf==3)
if (zoom==3)
{
ESDWORD[s+8] = ESDWORD[i];
ESDWORD[zline_w+s+8] = ESDWORD[i];
@@ -137,24 +122,17 @@ void DrawBufer::Zoom2x()
point_x++;
if (point_x >= bufw)
{
s += zoomf - 1 * zline_w;
s += zoom - 1 * zline_w;
point_x = 0;
}
}
}
*/
void DrawBufer::Show()
{
if (zoomf == 1)
{
PutPaletteImage(buf_data+8, bufw, bufh, bufx, bufy, 32, 0);
}
else
{
Zoom2x();
PutPaletteImage(zbuf_data+8, zbufw, zbufh, zbufx, zbufy, 32, 0);
}
PutPaletteImage(buf_data+8, bufw, bufh, bufx, bufy, 32, 0);
}
#endif