Fixed selection which didn't show sometimes release-1-12-maintained
authorinsilmaril
Tue, 01 Dec 2009 11:06:41 +0000
branchrelease-1-12-maintained
changeset 781a72c8f24c6e
parent 77 bdfc1079a723
child 79 32f499cbe874
Fixed selection which didn't show sometimes
mapeditor.cpp
selection.cpp
tex/vym.changelog
version.h
     1.1 --- a/mapeditor.cpp	Mon Nov 16 09:07:17 2009 +0000
     1.2 +++ b/mapeditor.cpp	Tue Dec 01 11:06:41 2009 +0000
     1.3 @@ -3218,7 +3218,7 @@
     1.4  						xelection.select(bo);
     1.5  						xelection.update();
     1.6  						ensureSelectionVisible();
     1.7 -					sendSelection();
     1.8 +						sendSelection();
     1.9  					}
    1.10  				}
    1.11  			}
     2.1 --- a/selection.cpp	Mon Nov 16 09:07:17 2009 +0000
     2.2 +++ b/selection.cpp	Tue Dec 01 11:06:41 2009 +0000
     2.3 @@ -40,16 +40,17 @@
     2.4  void Selection::update()
     2.5  {
     2.6  	QRectF bbox;
     2.7 -	int w=0;
     2.8  	for (int i=0; i< selectList.count(); ++i) 
     2.9  	{
    2.10  		bbox=selectList.at(i)->getBBox();
    2.11  		selboxList.at(i)->setRect (
    2.12 -			bbox.x()-w,bbox.y()-w, 
    2.13 -			bbox.width()+2*w, bbox.height()+2*w);
    2.14 +			bbox.x(),bbox.y(), 
    2.15 +			bbox.width(), bbox.height());
    2.16  		selboxList.at(i)->setPen (color);	
    2.17  		selboxList.at(i)->setBrush (color);	
    2.18 +		selboxList.at(i)->show();
    2.19  	}	
    2.20 +	model->getMapEditor()->getScene()->update();
    2.21  }
    2.22  
    2.23  void Selection::setColor (QColor col)
     3.1 --- a/tex/vym.changelog	Mon Nov 16 09:07:17 2009 +0000
     3.2 +++ b/tex/vym.changelog	Tue Dec 01 11:06:41 2009 +0000
     3.3 @@ -1,3 +1,10 @@
     3.4 +-------------------------------------------------------------------
     3.5 +Mon Nov 30 19:34:51 CET 2009 - uwe
     3.6 +
     3.7 +- Version: 1.12.6
     3.8 +- Bugfix: Selection rectangle not always shown, forcing update of
     3.9 +          QGraphicsScene now.
    3.10 +
    3.11  -------------------------------------------------------------------
    3.12  Mon Nov 16 10:03:52 CET 2009 - uwe@insilmaril.de
    3.13  
     4.1 --- a/version.h	Mon Nov 16 09:07:17 2009 +0000
     4.2 +++ b/version.h	Tue Dec 01 11:06:41 2009 +0000
     4.3 @@ -4,10 +4,10 @@
     4.4  #include <QString>
     4.5  
     4.6  #define __VYM_NAME "VYM"
     4.7 -#define __VYM_VERSION "1.12.5"
     4.8 +#define __VYM_VERSION "1.12.6"
     4.9  #define __VYM_CODENAME "Maintenance Update "
    4.10  //#define __VYM_CODENAME "Codename: development version"
    4.11 -#define __VYM_BUILD_DATE "2009-08-06"
    4.12 +#define __VYM_BUILD_DATE "2009-11-30"
    4.13  
    4.14  
    4.15  bool checkVersion(const QString &);