root/campo-sirio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Patch level : 10.0

Browse Source 
Files correlati     : xi.dll
Ricompilazione Demo : [ ]
Commento            :
Resi meno profondi i bottoni dei listbox/querybox


git-svn-id: svn://10.65.10.50/trunk@17309 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
guy 2008-09-26 13:26:56 +00:00
parent d2874d1407
commit f01717c80b
3 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
xi/xi.c
View File

@ -719,7 +719,7 @@ do_edit_menu( XI_OBJ * itf, XinEvent * ep )
break; break;
} }
} }
/* Che programmatore cazzone!
while ( size-- > 0 ) while ( size-- > 0 )
{ {
XinEvent ev; XinEvent ev;
@ -730,6 +730,19 @@ do_edit_menu( XI_OBJ * itf, XinEvent * ep )
xi_event( win, &ev ); xi_event( win, &ev );
XinWindowPaintForce( win ); XinWindowPaintForce( win );
} }
*/
if (size) // Molto meglio cosi!
{
XinEvent ev;
MEMCLEAR( ev );
ev.type = XinEventCharacter;
while ( size-- > 0 )
{
ev.v.character.ch = ( unsigned char ) *p++;
xi_event( win, &ev );
}
}
itf->v.itf->pasting = FALSE; itf->v.itf->pasting = FALSE;
XinMemoryFree( cb ); XinMemoryFree( cb );
} }
@ -1184,6 +1197,7 @@ xi_draw_field_button( XI_OBJ * xi_obj )
const XinColor color_light = aga_get_pref(AGA_PREF_BTN_COLOR_LIGHT); const XinColor color_light = aga_get_pref(AGA_PREF_BTN_COLOR_LIGHT);
const XinColor color_ctrl = aga_get_pref(AGA_PREF_BTN_COLOR_CTRL); const XinColor color_ctrl = aga_get_pref(AGA_PREF_BTN_COLOR_CTRL);
const XinColor color_dark = aga_get_pref(AGA_PREF_BTN_COLOR_DARK); const XinColor color_dark = aga_get_pref(AGA_PREF_BTN_COLOR_DARK);
const int button_depth = 1;
#if XIWS != XIWS_WM #if XIWS != XIWS_WM
int x, int x,
@ -1204,27 +1218,22 @@ xi_draw_field_button( XI_OBJ * xi_obj )
xi_set_clip( win, NULL ); xi_set_clip( win, NULL );
#if XIWS != XIWS_WM #if XIWS != XIWS_WM
r = fd->btn_rct; r = fd->btn_rct;
r.top++; xi_inflate_rect( &r, -1 );
r.left++;
r.bottom--;
r.right--;
if ( ( BOOLEAN ) xi_get_pref( XI_PREF_3D_LOOK ) ) if ( ( BOOLEAN ) xi_get_pref( XI_PREF_3D_LOOK ) )
xi_draw_3d_rect(win, &r, fd->down, 2, color_light, color_ctrl, color_dark); xi_draw_3d_rect(win, &r, fd->down, button_depth, color_light, color_ctrl, color_dark);
else else
{ {
XinWindowBrushSet( win, &white_cbrush ); XinWindowBrushSet( win, &white_cbrush );
XinWindowPenSet( win, &hollow_cpen ); XinWindowPenSet( win, &hollow_cpen );
xi_draw_rect( win, &r ); xi_draw_rect( win, &r );
} }
// Guy was here // Guy was here: center icon in button
x = (r.left+r.right)/2-16; // x = r.left + 3; x = (r.left+r.right)/2-16; // x = r.left + 3;
y = (r.top+r.bottom)/2-16; // y = r.top + 2; y = (r.top+r.bottom)/2-16; // y = r.top + 2;
cr = r; cr = r;
cr.top += 2; xi_inflate_rect( &cr, -button_depth );
cr.left += 2;
cr.bottom -= 2;
cr.right -= 2;
xi_set_clip( win, &cr ); xi_set_clip( win, &cr );
if ( fd->button_bitmap != NULL ) if ( fd->button_bitmap != NULL )
xi_bitmap_draw( fd->button_bitmap, win, &cr, &cr, FALSE ); xi_bitmap_draw( fd->button_bitmap, win, &cr, &cr, FALSE );

1
xi/xilm3.c
View File

@ -3004,6 +3004,7 @@ draw_lm( LM lm, BOOLEAN update )
lm_black_cpen.fore_color = XI_COLOR_BLACK; lm_black_cpen.fore_color = XI_COLOR_BLACK;
lm_black_cpen.pattern = XinPenSolid; lm_black_cpen.pattern = XinPenSolid;
XinWindowDrawToolsNormalGet( &lm_normal_ctools ); XinWindowDrawToolsNormalGet( &lm_normal_ctools );
lm_tools_inited = TRUE; // Added by Guy :-(
} }
/***********************************************************************/ /***********************************************************************/

4
xi/xiutils.c
View File

@ -21,7 +21,7 @@
#if XIWS == XIWS_WM #if XIWS == XIWS_WM
#define STX_VERT_FUDGE 0 #define STX_VERT_FUDGE 0
#define BORDER_WIDTH 8 //Gia' definito altrove! #define BORDER_WIDTH 8
#define EDIT_BORDER_WIDTH_Y 0 #define EDIT_BORDER_WIDTH_Y 0
#define EDIT_BORDER_SPACE_Y 0 #define EDIT_BORDER_SPACE_Y 0
#define BORDER_WIDTH_X 8 #define BORDER_WIDTH_X 8
@ -30,7 +30,7 @@
#define BORDER_SPACE_Y 0 #define BORDER_SPACE_Y 0
#else #else
#define STX_VERT_FUDGE 6 #define STX_VERT_FUDGE 6
#define BORDER_WIDTH 2 //Gia' definito altrove! #define BORDER_WIDTH 2
#define EDIT_BORDER_WIDTH_Y 1 #define EDIT_BORDER_WIDTH_Y 1
#define EDIT_BORDER_SPACE_Y 1 #define EDIT_BORDER_SPACE_Y 1
#define BORDER_WIDTH_X 1 #define BORDER_WIDTH_X 1