Skip to content

Commit 6124e81

Browse files
committed
Merge pull request #47 from BurrrY/master
BugFixes
2 parents 5b9a43a + 03cd371 commit 6124e81

File tree

3 files changed

+21
-11
lines changed

3 files changed

+21
-11
lines changed

fsettingsdialog.ui

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@
256256
<widget class="QWidget" name="widget_3" native="true">
257257
<layout class="QGridLayout" name="gridLayout">
258258
<item row="0" column="1" colspan="2">
259-
<widget class="QComboBox" name="cb_int_laguage"/>
259+
<widget class="QComboBox" name="cb_int_language"/>
260260
</item>
261261
<item row="4" column="2">
262262
<widget class="QPushButton" name="pb_selectStylesheet">

mainwindow.cpp

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -587,6 +587,11 @@ void MainWindow::prepareResize(QMouseEvent *event) {
587587

588588
void MainWindow::mouseReleaseEvent(QMouseEvent *event)
589589
{
590+
if(resizeHeightEnabled||resizeWidthEnabled||resizeWidthEnabledInv) {
591+
resizeTimer.start(1000);
592+
qDebug() << "Start Tiemr";
593+
}
594+
590595
dragEnabled = false;
591596
resizeHeightEnabled = false;
592597
resizeWidthEnabled = false;
@@ -607,15 +612,9 @@ void MainWindow::mouseDoubleClickEvent(QMouseEvent *event)
607612

608613
void MainWindow::resizeDone()
609614
{
610-
/*
611-
if(currentView==0){
612-
db.updateIntPref("minviewWidth", this->width());
613-
db.updateIntPref("minviewHeight", this->height());
614-
} else */
615-
{
616-
db.updateIntPref("defaultviewWidth", this->width());
617-
db.updateIntPref("defaultviewHeight", this->height());
618-
}
615+
616+
db.updateIntPref("defaultviewWidth", this->width());
617+
db.updateIntPref("defaultviewHeight", this->height());
619618
}
620619

621620
void MainWindow::mouseMoveEvent(QMouseEvent *event)

stylesheet.qss

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,15 @@ background-color: #3fc1f4;
5252
background:#1DAEE1;
5353
}
5454

55-
#MainWindow {
55+
#MainWindow, QDialog {
5656
background:#1DAEE1;
5757
}
5858

59+
QPushButton {
60+
background:#dadada;
61+
border: 1px solid #eee;
62+
padding: 3px 13px;
63+
}
5964

6065
FGameWidget #fgwDialog_GameTitle{
6166
font-size:14pt;
@@ -76,6 +81,10 @@ FGameWidget #fgwDialog_Background[gameSelected="true"] {
7681
color: #2DAAE1;
7782
}
7883

84+
#w_mainInfo {
85+
color: #2DAAE1;
86+
}
87+
7988

8089
#gameScrollArea, #scrollAreaWidgetContents, #gameListWidget {
8190
background: transparent;
@@ -130,6 +139,8 @@ QScrollBar::down-button:vertical, #gameScrollArea::up-button:vertical{
130139

131140
#w_globalButtons QPushButton{
132141
border-radius: 28px;
142+
border: 0px solid #eee;
143+
padding: 0;
133144
width:56px;
134145
height:56px;
135146
background: #1DAAE1;

0 commit comments

Comments
 (0)