kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2025-12-18 05:00:33 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix segfault on Windows

Browse Source 
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@3162 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
scorpio810
2014-06-22 14:42:30 +00:00
parent efa2854f40
commit 088c7f85e6
2 changed files with 2 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
sources/elementspanel.cpp
View File

@@ -132,10 +132,7 @@ bool ElementsPanel::selectedItemIsWritable() const {
@return la collection, la categorie ou l'element selectionne(e) @return la collection, la categorie ou l'element selectionne(e)
*/ */
ElementsCollectionItem *ElementsPanel::selectedItem() const { ElementsCollectionItem *ElementsPanel::selectedItem() const {
// change color of drag element
if(it_prev_) {
it_prev_->setBackgroundColor(0, Qt::white);
}
ElementsLocation selected_location(selectedElementLocation()); ElementsLocation selected_location(selectedElementLocation());
if (!selected_location.isNull()) { if (!selected_location.isNull()) {
@@ -205,16 +202,6 @@ void ElementsPanel::dragMoveEvent(QDragMoveEvent *e) {
} }
#endif #endif
// Change color on mouse over
it_ = itemAt(e -> pos());
if(it_prev_){
if(it_ != it_prev_){
it_->setBackgroundColor(0, Qt::cyan);
it_prev_->setBackgroundColor(0, Qt::white);
it_prev_ = it_;
}
}
else it_prev_ = it_;
e -> accept(); e -> accept();
/// @todo mettre en valeur le lieu de depot /// @todo mettre en valeur le lieu de depot

2
sources/qetapp.cpp
View File

@@ -954,12 +954,12 @@ void QETApp::useSystemPalette(bool use) {
"}" "}"
); );
} else { } else {
setPalette(style() -> standardPalette());
setStyleSheet( setStyleSheet(
"QTabBar::tab:!selected { background-color: transparent; }" "QTabBar::tab:!selected { background-color: transparent; }"
"QMainWindow{ background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 rgb(43, 75, 116), stop:1 rgb(197, 245, 254)); }" "QMainWindow{ background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 rgb(43, 75, 116), stop:1 rgb(197, 245, 254)); }"
"QListView{ background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 rgb(43, 75, 116), stop:1 rgb(130, 160, 210)); }" "QListView{ background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 rgb(43, 75, 116), stop:1 rgb(130, 160, 210)); }"
"QAbstractScrollArea#mdiarea {" "QAbstractScrollArea#mdiarea {"
" background-color -> setPalette(initial_palette_);" " background-color -> setPalette(initial_palette_);"
" background-image: url(':/ico/mdiarea_bg.png');" " background-image: url(':/ico/mdiarea_bg.png');"
" background-repeat: no-repeat;" " background-repeat: no-repeat;"