Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

font tweaking and washcolor property adding

  • Loading branch information...
commit 99069983e2e426bfb348af7d7648681cc1f05348 1 parent ca170b9
@lcuk authored
View
6 debian/changelog
@@ -1,3 +1,9 @@
+libliqbase (0.3.73) unstable; urgency=low
+
+ * default font tweaks
+
+ -- Gary Birkett <liquid@gmail.com> Sun, 31 Jul 2011 00:11:10 +0000
+
libliqbase (0.3.72) unstable; urgency=low
* adding PolyFill! Sketch tool 5 :)
View
19 src/liqcell_easypaint.c
@@ -1100,6 +1100,7 @@ __tz_one("imageprep");
liqcliprect_drawimagecolor(cr,self->image,xx,yy,rw,rh,1);
else
liqcliprect_drawimagecolor(cr,self->image,xx,yy,rw,rh,0);
+
//liqapp_log("imagefloat: making dirty");
@@ -1124,6 +1125,24 @@ __tz_one("imageprep");
// liqapp_log("imagestde: '%s' draw %4i,%4i - %4i,%4i ",self->name,x,y,w,h );
}
+
+
+ unsigned char wcy=255;
+ unsigned char wcu=128;
+ unsigned char wcv=128;
+ unsigned char wca=255; // 20090816_101834 lcuk : new..
+ unsigned char wcc=0; // Sun Aug 30 23:21:52 2009 lcuk : new class 0==std 1=xrgb(). mmm date format has been lost
+
+ t = liqcell_propgets(self,"washcolor",NULL);
+ if(t)
+ {
+ //liqapp_log("washcolor :: '%s'",t);
+ if(decodecolor(t, &wcy, &wcu, &wcv, &wca, &wcc ))
+ {
+ liqcliprect_drawboxwashcolor( cr,x,y,w,h, wcu,wcv);
+ }
+ }
+
}
View
14 src/liqfont.c
@@ -391,7 +391,19 @@ liqfont * liqfont_newfromfilettf(const char *name,int size,int rotation)
//rotation=90;
//rotation=0;
- //liqapp_log("TTF Font opening File %s, %i:",name,size);
+
+
+ if(strcasecmp(name,"/usr/share/fonts/nokia/nosnb.ttf")==0)
+ {
+
+ name="/usr/share/fonts/nokia/Nokia Pure/NokiaPureMg.ttf";
+ if(!liqapp_fileexists(name)) name="/usr/share/fonts/truetype/ttf-nokiapure/NokiaPure.ttf";
+ if(!liqapp_fileexists(name)) name="/usr/share/fonts/nokia/nosnr.ttf";
+ if(!liqapp_fileexists(name)) name="/usr/share/fonts/droid/DroidSans.ttf";
+ if(!liqapp_fileexists(name)) name="/usr/share/fonts/nokia/nosnb.ttf";
+ }
+
+ liqapp_log("TTF Font opening File %s, %i:",name,size);
liqfont *self = liqfont_new();
if(self==NULL) { liqapp_warnandcontinue(-1, "liqfont_newfromfilettf creation failed" ); return NULL; }
View
5 src/liqfontview.c
@@ -333,9 +333,10 @@ FT_Error fterr;
//liqapp_log("TTF Font opening face %s, %i:",name,size);
char *fn = self->font->filename;
- if(!liqapp_fileexists(fn)) fn="/usr/share/fonts/droid/DroidSans.ttf";
+ if(!liqapp_fileexists(fn)) fn="/usr/share/fonts/nokia/Nokia Pure/NokiaPureMg.ttf";
if(!liqapp_fileexists(fn)) fn="/usr/share/fonts/nokia/nosnb.ttf";
-
+ if(!liqapp_fileexists(fn)) fn="/usr/share/fonts/droid/DroidSans.ttf";
+
fterr = FT_New_Face( ftlib, fn, 0, (FT_Face*)&self->ftface );
if ( fterr == FT_Err_Cannot_Open_Stream )
Please sign in to comment.
Something went wrong with that request. Please try again.