[GreenPad-vc4] squashed merge of default branch GreenPad changes:

- [GreenPad] reorder loop conditions (a6e710b) - [GreenPad] pass by reference in `DrawTXT` (7905c89)
roytam1 · Jun 30, 2023 · 9149041 · 9149041
1 parent 7905c89
commit 9149041
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/GreenPad-vc4/editwing/ip_draw.cpp b/GreenPad-vc4/editwing/ip_draw.cpp
@@ -587,7 +587,7 @@ inline void ViewImpl::Inv( int y, int xb, int xe, Painter& p )
 	p.Invert( rc );
 }
 
-void ViewImpl::DrawTXT( const VDrawInfo v, Painter& p )
+void ViewImpl::DrawTXT( const VDrawInfo& v, Painter& p )
 {
 	// 定数１
 //	const int   TAB = p.T();

diff --git a/GreenPad-vc4/editwing/ip_text.cpp b/GreenPad-vc4/editwing/ip_text.cpp
@@ -363,7 +363,7 @@ DPos DocImpl::rightOf( const DPos& dp, bool wide ) const
 		if( s >= e )
 			s = e;
 		else if( t==7 || t==0 )
-			while( (f[s]>>5)==0 && s<e )
+			while( s<e && (f[s]>>5)==0 )
 				++s;
 		return DPos( dp.tl, s );
 	}
@@ -381,7 +381,7 @@ DPos DocImpl::wordStartOf( const DPos& dp ) const
 		// 行の途中
 		const uchar* f = pl(dp.tl);
 			  ulong  s = dp.ad;
-		while( (f[s]>>5)==0 && 0<=s )
+		while( 0<=s && (f[s]>>5)==0 )
 			--s;
 		return DPos( dp.tl, s );
 	}

diff --git a/GreenPad-vc4/editwing/ip_view.h b/GreenPad-vc4/editwing/ip_view.h
@@ -404,7 +404,7 @@ class ViewImpl : public Object
 private:
 
 	void DrawLNA( const VDrawInfo& v, Painter& p );
-	void DrawTXT( const VDrawInfo v, Painter& p );
+	void DrawTXT( const VDrawInfo& v, Painter& p );
 	void Inv( int y, int xb, int xe, Painter& p );
 
 	void CalcEveryLineWidth();