[Libufo-commits] ufo-0.5/src/ui ustylehints.cpp,1.2,1.3

[Johannes S. <sch...@us...>]

Update of /cvsroot/libufo/ufo-0.5/src/ui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4379/src/ui

Modified Files:
	ustylehints.cpp 
Log Message:
Fixed UStyleHints::transcribe (border property).

Index: ustylehints.cpp
===================================================================
RCS file: /cvsroot/libufo/ufo-0.5/src/ui/ustylehints.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ustylehints.cpp	16 Jul 2005 13:47:27 -0000	1.2
--- ustylehints.cpp	11 Oct 2005 20:21:10 -0000	1.3
***************
*** 80,97 ****
  	preferredSize.transcribe(hints->preferredSize);
  	// FIXME:
! 	if (hints->border->borderType == NoBorder) {
  		border->borderType = hints->border->borderType;
  	}
  	for (int i = 0; i < 4; ++i) {
! 		if (hints->border->color[i] == UColor()) {
  			border->color[i] = hints->border->color[i];
  		}
! 		if (hints->border->style[i] == NoBorderStyle) {
  			border->style[i] = hints->border->style[i];
  		}
! 		if (hints->border->width[i] == 0) {
  			border->width[i] = hints->border->width[i];
  		}
! 		if (hints->border->radius[i] == 0) {
  			border->radius[i] = hints->border->radius[i];
  		}
--- 80,97 ----
  	preferredSize.transcribe(hints->preferredSize);
  	// FIXME:
! 	if (hints->border->borderType != NoBorder) {
  		border->borderType = hints->border->borderType;
  	}
  	for (int i = 0; i < 4; ++i) {
! 		if (hints->border->color[i] != UColor()) {
  			border->color[i] = hints->border->color[i];
  		}
! 		if (hints->border->style[i] != NoBorderStyle) {
  			border->style[i] = hints->border->style[i];
  		}
! 		if (hints->border->width[i] != 0) {
  			border->width[i] = hints->border->width[i];
  		}
! 		if (hints->border->radius[i] != 0) {
  			border->radius[i] = hints->border->radius[i];
  		}