mask.cpp Allungata toolbar fino in fondo
msksheet.cpp Colorato sfondo con focus# xvtility.cpp Corretto calcolo dimensioni TASK_WIN (senza status bar) git-svn-id: svn://10.65.10.50/trunk@2717 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
		
							parent
							
								
									4d0256febc
								
							
						
					
					
						commit
						591691779c
					
				| @ -1022,7 +1022,7 @@ WINDOW TMask::read_page( | ||||
| 
 | ||||
|   if (toolbar || toolwin()) | ||||
|   { | ||||
|     w = create(0, r.top, 0, r.bottom, | ||||
|     w = create(0, r.top, 0, toolbar ? 0 : tooly, | ||||
|                title, toolbar ? 0 : WSF_INVISIBLE, W_PLAIN); | ||||
|   } | ||||
|   else | ||||
|  | ||||
| @ -368,7 +368,7 @@ TSpreadsheet::TSpreadsheet( | ||||
|                                         XI_ATR_ENABLED | XI_ATR_VISIBLE, | ||||
|                                         NORMAL_COLOR, NORMAL_BACK_COLOR,    // normal
 | ||||
|                                         NORMAL_COLOR, DISABLED_BACK_COLOR,  // disabled
 | ||||
|                                         COLOR_RED,                          // active
 | ||||
|                                         FOCUS_COLOR,                        // active
 | ||||
|                                         LIST_CID); | ||||
| #else | ||||
|   XI_OBJ_DEF* listdef = xi_add_list_def(itfdef, LIST_CID, | ||||
| @ -376,7 +376,7 @@ TSpreadsheet::TSpreadsheet( | ||||
|                                         XI_ATR_ENABLED | XI_ATR_VISIBLE, | ||||
|                                         NORMAL_COLOR, NORMAL_BACK_COLOR,    // normal
 | ||||
|                                         NORMAL_COLOR, DISABLED_BACK_COLOR,  // disabled
 | ||||
|                                         COLOR_RED,                          // active
 | ||||
|                                         FOCUS_COLOR,                        // active
 | ||||
|                                         LIST_CID); | ||||
| #endif | ||||
|   listdef->v.list->sizable_columns = TRUE; | ||||
| @ -392,6 +392,7 @@ TSpreadsheet::TSpreadsheet( | ||||
|   listdef->v.list->min_cell_height = CHARY; | ||||
|   listdef->v.list->min_heading_height = CHARY; | ||||
|   listdef->v.list->white_space_color = MASK_DARK_COLOR; | ||||
|   listdef->v.list->active_back_color = FOCUS_BACK_COLOR; | ||||
|    | ||||
|   word attr = XI_ATR_RJUST;                                             | ||||
|   if (sheet_mask().id2pos(FIRST_FIELD -1) != -1) | ||||
| @ -941,15 +942,17 @@ void TSpreadsheet::list_handler(XI_EVENT *xiev) | ||||
|         on_idle();            // Forces update delayed by str2mask
 | ||||
|       } | ||||
|        | ||||
|       const int button_pos = sheet_mask().id2pos(FIRST_FIELD-1); | ||||
|       const TMask& sm = sheet_mask(); | ||||
|       const int button_pos = sm.id2pos(FIRST_FIELD-1); | ||||
|       if (button_pos >= 0) | ||||
|       { | ||||
|         TMask_field& button = sheet_mask().fld(button_pos);   | ||||
|         TMask_field& button = sm.fld(button_pos);   | ||||
|         if (button.active()) | ||||
|         { | ||||
|           if (!sm.is_running()) | ||||
|             str2mask(_cur_rec); | ||||
|           button.on_hit();    | ||||
|           if (sheet_mask().dirty()) | ||||
|           if (sm.dirty()) | ||||
|           {  | ||||
|             notify_change(); | ||||
|             mask2str(_cur_rec); | ||||
|  | ||||
| @ -369,7 +369,7 @@ RCT& resize_rect( | ||||
|     if (parent == NULL_WIN) parent = TASK_WIN; | ||||
|     xvt_vobj_get_client_rect(parent, &pc);     // Get parent window size
 | ||||
|     const short MAXX = pc.right; | ||||
|     const short MAXY = pc.bottom; | ||||
|     const short MAXY = pc.bottom - (parent == TASK_WIN ? 26 : 0); | ||||
| 
 | ||||
|     if (x < 0) | ||||
|     { | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user