fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2011-09-06 09:33 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)

Browse Source 
* harbour/include/hbgtinfo.ch
    + added new hb_gtInfo() action: HB_GTI_FONTATTRIBUTE and attributes:
      HB_GTI_FONTA_FIXMETRIC, HB_GTI_FONTA_CLRBKG, HB_GTI_FONTA_DRAWBOX

  * harbour/src/rtl/gtxwc/gtxwc.c
    + implemented HB_GTI_FONTATTRIBUTE.
      Now user can make:
         hb_gtInfo( HB_GTI_FONTATTRIBUTE, HB_GTI_FONTA_FIXMETRIC + ;
                    HB_GTI_FONTA_CLRBKG + HB_GTI_FONTA_DRAWBOX )
      and use also fonts with broken metrics.
This commit is contained in:
Przemyslaw Czerpak
2011-09-06 07:33:58 +00:00
parent ff61798732
commit b3229d9c73
3 changed files with 33 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
harbour/ChangeLog
View File

@@ -16,6 +16,18 @@
The license applies to all entries newer than 2009-04-28.
*/
2011-09-06 09:33 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/include/hbgtinfo.ch
+ added new hb_gtInfo() action: HB_GTI_FONTATTRIBUTE and attributes:
HB_GTI_FONTA_FIXMETRIC, HB_GTI_FONTA_CLRBKG, HB_GTI_FONTA_DRAWBOX
* harbour/src/rtl/gtxwc/gtxwc.c
+ implemented HB_GTI_FONTATTRIBUTE.
Now user can make:
hb_gtInfo( HB_GTI_FONTATTRIBUTE, HB_GTI_FONTA_FIXMETRIC + ;
HB_GTI_FONTA_CLRBKG + HB_GTI_FONTA_DRAWBOX )
and use also fonts with broken metrics.
2011-09-05 22:40 UTC+0100 Jean Lefebvre mafact (jfl@mafact.com)
* contrib/rddads/ads1.c
+ Correction: ahIndex Back from 512 to 256 (max coumpound index)

7
harbour/include/hbgtinfo.ch
View File

@@ -149,6 +149,8 @@
#define HB_GTI_MAXIMIZED 66 /* Get/Set Window's Maximized status (supported by: GTWVT) */
#define HB_GTI_FONTATTRIBUTE 67 /* Get/set font attribute */
/* Font weights */
#define HB_GTI_FONTW_THIN 1
#define HB_GTI_FONTW_NORMAL 2
@@ -159,6 +161,11 @@
#define HB_GTI_FONTQ_NORMAL 2
#define HB_GTI_FONTQ_HIGH 3
/* Font attributes */
#define HB_GTI_FONTA_FIXMETRIC 1
#define HB_GTI_FONTA_CLRBKG 2
#define HB_GTI_FONTA_DRAWBOX 4
/* Keyboard shifts states */
#define HB_GTI_KBD_SHIFT 0x000001
#define HB_GTI_KBD_CTRL 0x000002

14
harbour/src/rtl/gtxwc/gtxwc.c
View File

@@ -3961,6 +3961,20 @@ static HB_BOOL hb_gt_xwc_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
}
break;
case HB_GTI_FONTATTRIBUTE:
pInfo->pResult = hb_itemPutNI( pInfo->pResult,
( wnd->fFixMetric ? HB_GTI_FONTA_FIXMETRIC : 0 ) |
( wnd->fClearBkg ? HB_GTI_FONTA_CLRBKG : 0 ) |
( wnd->fDrawBox ? HB_GTI_FONTA_DRAWBOX : 0 ) );
if( hb_itemType( pInfo->pNewVal ) & HB_IT_NUMERIC )
{
iVal = hb_itemGetNI( pInfo->pNewVal );
wnd->fFixMetric = ( iVal & HB_GTI_FONTA_FIXMETRIC ) != 0;
wnd->fClearBkg = ( iVal & HB_GTI_FONTA_CLRBKG ) != 0;
wnd->fDrawBox = ( iVal & HB_GTI_FONTA_DRAWBOX ) != 0;
}
break;
case HB_GTI_BOXCP:
pInfo->pResult = hb_itemPutC( pInfo->pResult,
wnd->boxCDP ? wnd->boxCDP->id : NULL );