[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : alex
Repository : xara
Revision   : 1091
Date       : Tue May 16 23:53:24 BST 2006

Changed paths:
   M /Trunk/XaraLX/Kernel/statline.h
   M /Trunk/XaraLX/wxOil/progress.cpp

Finally fixed slow text tool rendering


Diff:
Index: Trunk/XaraLX/Kernel/statline.h
===================================================================
--- Trunk/XaraLX/Kernel/statline.h	(revision 1090)
+++ Trunk/XaraLX/Kernel/statline.h	(revision 1091)
@@ -208,9 +208,11 @@
 public:
 	BOOL ShowProgress (BOOL Show=TRUE, StringBase *JobDescrip = NULL);
 
-	INT32 GetPercent(void) const {return CurrentPercent;}
+	INT32 GetPercent() const {return CurrentPercent;}
 	BOOL SetPercent(INT32 Percent, BOOL RedrawBackground = FALSE, StringBase *JobDescrip = NULL);
 
+	BOOL IsProgressShown() const {return ProgressShown;}
+
 protected:
 	INT32 CurrentPercent;			// The currently displayed percentage value
 	String_256 *JobDescription;	// NULL, or pointer to description of current job
Index: Trunk/XaraLX/wxOil/progress.cpp
===================================================================
--- Trunk/XaraLX/wxOil/progress.cpp	(revision 1090)
+++ Trunk/XaraLX/wxOil/progress.cpp	(revision 1091)
@@ -849,7 +849,7 @@
 	if (ActiveDisplays > 0)
 		return;
 
-	if (StatusLine::Get() && CurrentPercent < 97)
+	if (StatusLine::Get() && StatusLine::Get()->IsProgressShown() && CurrentPercent < 97)
 	{
 		// We are showing a progress bar, but have not shown "completion" of the job (99%)
 		// Briefly jump to 99% on the progress bar so the user can't see how bad our estimate


Xara