Revision 11547 branches/v10/libraries/libFMap/src/com/iver/cit/gvsig/fmap/core/v02/FGraphicUtilities.java

View differences:

FGraphicUtilities.java
534 534
			// de FSymbol.
535 535
			// CAMBIO: La altura del texto la miramos en FLabel
536 536
			// float alturaPixels = (float) (theSymbol.m_FontSize * mT.getScaleX());
537
			float alturaPixels = (float) (theLabel.getHeight() * at.getScaleX()*FLabel.SQUARE);
537
			float alturaPixels = (float) (theLabel.getHeight() * at.getScaleX());
538 538
			if (alturaPixels < 3) {
539 539
				return; // No leemos nada
540 540
			}
541 541
			Font nuevaFuente = theSymbol.getFont().deriveFont(alturaPixels);
542 542
			g2.setFont(nuevaFuente);
543 543
		}
544
		else{
545
			g2.setFont(theSymbol.getFont());
546
		}
544 547

  
545 548

  
546 549
		if (isSelected){
......
711 714
			case FConstant.SYMBOL_STYLE_MARKER_SQUARE: // Cuadrado
712 715
			case FConstant.SYMBOL_STYLE_FILL_SOLID:
713 716
				g2.fillRect(rectAux.x, rectAux.y, rectAux.width, rectAux.height);
714

  
717
				
715 718
				if (theSymbol.isOutlined()) {
716 719
					g2.setColor(theSymbol.getOutlineColor());
717 720
					g2.drawRect(rectAux.x, rectAux.y, rectAux.width,

Also available in: Unified diff