t.mettler/giesCANne
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix compilation on Windows, fix glitch that could cause windows to appear off the actual screen with no way to get them back.

Browse Source
This commit is contained in:
Collin Kidder
2020-11-15 01:30:13 -08:00
parent 80523f2eeb
commit b345495178
21 changed files with 41 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
re/dbccomparatorwindow.cpp
+1 -1
View File
@@ -66,7 +66,7 @@ void DBCComparatorWindow::readSettings()
if (settings.value("Main/SaveRestorePositions", false).toBool())
{
resize(settings.value("DBCComparator/WindowSize", QSize(720, 631)).toSize());
move(settings.value("DBCComparator/WindowPos", QPoint(50, 50)).toPoint());
move(Utility::constrainedWindowPos(settings.value("DBCComparator/WindowPos", QPoint(50, 50)).toPoint()));
}
}
re/discretestatewindow.cpp
+1 -1
View File
@@ -198,7 +198,7 @@ void DiscreteStateWindow::readSettings()
if (settings.value("Main/SaveRestorePositions", false).toBool())
{
resize(settings.value("DiscreteState/WindowSize", QSize(400, 300)).toSize());
move(settings.value("DiscreteState/WindowPos", QPoint(50, 50)).toPoint());
move(Utility::constrainedWindowPos(settings.value("DiscreteState/WindowPos", QPoint(50, 50)).toPoint()));
}
}
re/filecomparatorwindow.cpp
+1 -1
View File
@@ -64,7 +64,7 @@ void FileComparatorWindow::readSettings()
if (settings.value("Main/SaveRestorePositions", false).toBool())
{
resize(settings.value("FileComparator/WindowSize", QSize(720, 631)).toSize());
move(settings.value("FileComparator/WindowPos", QPoint(50, 50)).toPoint());
move(Utility::constrainedWindowPos(settings.value("FileComparator/WindowPos", QPoint(50, 50)).toPoint()));
}
}
re/flowviewwindow.cpp
+1 -1
View File
@@ -158,7 +158,7 @@ void FlowViewWindow::readSettings()
if (settings.value("Main/SaveRestorePositions", false).toBool())
{
resize(settings.value("FlowView/WindowSize", QSize(1078, 621)).toSize());
move(settings.value("FlowView/WindowPos", QPoint(50, 50)).toPoint());
move(Utility::constrainedWindowPos(settings.value("FlowView/WindowPos", QPoint(50, 50)).toPoint()));
}
if (settings.value("FlowView/AutoRef", false).toBool())
re/frameinfowindow.cpp
+1 -1
View File
@@ -170,7 +170,7 @@ void FrameInfoWindow::readSettings()
if (settings.value("Main/SaveRestorePositions", false).toBool())
{
resize(settings.value("FrameInfo/WindowSize", QSize(794, 694)).toSize());
move(settings.value("FrameInfo/WindowPos", QPoint(50, 50)).toPoint());
move(Utility::constrainedWindowPos(settings.value("FrameInfo/WindowPos", QPoint(50, 50)).toPoint()));
}
useOpenGL = settings.value("Main/UseOpenGL", false).toBool();
re/graphingwindow.cpp
+1 -1
View File
@@ -125,7 +125,7 @@ void GraphingWindow::readSettings()
if (settings.value("Main/SaveRestorePositions", false).toBool())
{
resize(settings.value("Graphing/WindowSize", QSize(800, 600)).toSize());
move(settings.value("Graphing/WindowPos", QPoint(50, 50)).toPoint());
move(Utility::constrainedWindowPos(settings.value("Graphing/WindowPos", QPoint(50, 50)).toPoint()));
}
secondsMode = settings.value("Main/TimeSeconds", false).toBool();
useOpenGL = settings.value("Main/UseOpenGL", false).toBool();
re/isotp_interpreterwindow.cpp
+1 -1
View File
@@ -112,7 +112,7 @@ void ISOTP_InterpreterWindow::readSettings()
if (settings.value("Main/SaveRestorePositions", false).toBool())
{
resize(settings.value("ISODecodeWindow/WindowSize", this->size()).toSize());
move(settings.value("ISODecodeWindow/WindowPos", QPoint(50, 50)).toPoint());
move(Utility::constrainedWindowPos(settings.value("ISODecodeWindow/WindowPos", QPoint(50, 50)).toPoint()));
}
}
re/rangestatewindow.cpp
+1 -1
View File
@@ -126,7 +126,7 @@ void RangeStateWindow::readSettings()
if (settings.value("Main/SaveRestorePositions", false).toBool())
{
resize(settings.value("RangeStateView/WindowSize", QSize(765, 615)).toSize());
move(settings.value("RangeStateView/WindowPos", QPoint(50, 50)).toPoint());
move(Utility::constrainedWindowPos(settings.value("RangeStateView/WindowPos", QPoint(50, 50)).toPoint()));
}
}
re/sniffer/snifferwindow.cpp
+2 -1
View File
@@ -6,6 +6,7 @@
#include "helpwindow.h"
#include "connections/canconmanager.h"
#include "SnifferDelegate.h"
#include "utility.h"
SnifferWindow::SnifferWindow(QWidget *parent) :
QDialog(parent),
@@ -73,7 +74,7 @@ void SnifferWindow::readSettings()
if (settings.value("Main/SaveRestorePositions", false).toBool())
{
resize(settings.value("Sniffer/WindowSize", QSize(1100, 750)).toSize());
move(settings.value("Sniffer/WindowPos", QPoint(50, 50)).toPoint());
move(Utility::constrainedWindowPos(settings.value("Sniffer/WindowPos", QPoint(50, 50)).toPoint()));
ui->treeView->setColumnWidth(0, settings.value("Sniffer/DeltaColumn", 110).toUInt());
ui->treeView->setColumnWidth(1, settings.value("Sniffer/IDColumn", 70).toUInt());
ui->treeView->setColumnWidth(2, settings.value("Sniffer/Data0Column", 92).toUInt());
re/temporalgraphwindow.cpp
+1 -1
View File
@@ -91,7 +91,7 @@ void TemporalGraphWindow::readSettings()
if (settings.value("Main/SaveRestorePositions", false).toBool())
{
resize(settings.value("Temporal/WindowSize", QSize(800, 600)).toSize());
move(settings.value("Temporal/WindowPos", QPoint(50, 50)).toPoint());
move(Utility::constrainedWindowPos(settings.value("Temporal/WindowPos", QPoint(50, 50)).toPoint()));
}
useOpenGL = settings.value("Main/UseOpenGL", false).toBool();
}