Patch level : 10.0
Files correlati : ba8.exe Ricompilazione Demo : [ ] Commento : Corretta gestione color dei campi di solo testo git-svn-id: svn://10.65.10.50/trunk@20356 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
		
							parent
							
								
									8adadf091b
								
							
						
					
					
						commit
						8dcb91beef
					
				@ -70,14 +70,10 @@ bool TReport_tree::goto_node(char type, int level)
 | 
				
			|||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void TReport_tree::node2id(const TObject* node, TString& id) const
 | 
					void TReport_tree::node2id(const TObject* node, TString& id) const
 | 
				
			||||||
{
 | 
					{ id = *(TString*)node; }
 | 
				
			||||||
  id = *(TString*)node;
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
int TReport_tree::curr_level() const
 | 
					int TReport_tree::curr_level() const
 | 
				
			||||||
{
 | 
					{ return atoi((const char*)_curr + 1); }
 | 
				
			||||||
  return atoi((const char*)_curr + 1);
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
TReport_section& TReport_tree::curr_section() const
 | 
					TReport_section& TReport_tree::curr_section() const
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
@ -92,9 +88,7 @@ TReport_section& TReport_tree::curr_section() const
 | 
				
			|||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
bool TReport_tree::goto_root()
 | 
					bool TReport_tree::goto_root()
 | 
				
			||||||
{
 | 
					{ return goto_node('P', 0); }
 | 
				
			||||||
  return goto_node('P', 0);
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
bool TReport_tree::goto_firstson()
 | 
					bool TReport_tree::goto_firstson()
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
@ -244,14 +238,7 @@ bool TReport_tree::has_root() const
 | 
				
			|||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
bool TReport_tree::has_father() const
 | 
					bool TReport_tree::has_father() const
 | 
				
			||||||
{
 | 
					{ return _curr[0] != 'P' && _curr[0] != 'R'; }
 | 
				
			||||||
/*
 | 
					 | 
				
			||||||
  if (curr_level() > 10)  // Subsection
 | 
					 | 
				
			||||||
    return true;
 | 
					 | 
				
			||||||
  return !has_son();
 | 
					 | 
				
			||||||
*/
 | 
					 | 
				
			||||||
  return _curr[0] != 'P' && _curr[0] != 'R';
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
bool TReport_tree::goto_father()
 | 
					bool TReport_tree::goto_father()
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
@ -1988,7 +1975,7 @@ void TReport_window::draw_field(const TReport_field& rf)
 | 
				
			|||||||
      {
 | 
					      {
 | 
				
			||||||
        bool printed = false;
 | 
					        bool printed = false;
 | 
				
			||||||
        xvt_dwin_set_font(win(), rf.font().get_xvt_font(*this));
 | 
					        xvt_dwin_set_font(win(), rf.font().get_xvt_font(*this));
 | 
				
			||||||
        set_color(rf.fore_color(), rf.back_color());
 | 
					        set_color(rf.text_color(), rf.back_color());
 | 
				
			||||||
        if (rf_rect.height() > 100 && rf_rect.width() > 100)
 | 
					        if (rf_rect.height() > 100 && rf_rect.width() > 100)
 | 
				
			||||||
        {
 | 
					        {
 | 
				
			||||||
          TParagraph_string para(str, rf_rect.width()/100);
 | 
					          TParagraph_string para(str, rf_rect.width()/100);
 | 
				
			||||||
 | 
				
			|||||||
@ -106,8 +106,6 @@ protected:
 | 
				
			|||||||
  virtual bool on_field_event(TOperable_field& o, TField_event e, long jolly);
 | 
					  virtual bool on_field_event(TOperable_field& o, TField_event e, long jolly);
 | 
				
			||||||
  virtual void update();
 | 
					  virtual void update();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
public:
 | 
					public:
 | 
				
			||||||
  void set_num(short id, long n);
 | 
					  void set_num(short id, long n);
 | 
				
			||||||
  long get_num(short id) const;
 | 
					  long get_num(short id) const;
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user