monero-project/monero-gui
monero-project/monero-gui
1
0
Fork 0
mirror of https://github.com/monero-project/monero-gui.git synced 2024-12-24 20:49:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #777

Browse source 
c65ee4e fix windows crash on startup requires #2101 (Jaquee)
03af067 Disabled update check requires #2101 (Jaquee)
This commit is contained in:
Riccardo Spagni 2017-07-03 11:53:43 +02:00
commit 27349d111d
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
MiddlePanel.qml
View file

@ -29,7 +29,7 @@
import QtQml 2.0 import QtQml 2.0
import QtQuick 2.2 import QtQuick 2.2
import QtQuick.Controls 2.0 //import QtQuick.Controls 2.0
import QtQuick.Controls 1.4 import QtQuick.Controls 1.4
import QtQuick.Layouts 1.1 import QtQuick.Layouts 1.1
import QtGraphicalEffects 1.0 import QtGraphicalEffects 1.0
@ -187,8 +187,9 @@ Rectangle {
Layout.fillWidth: true Layout.fillWidth: true
Layout.fillHeight: true Layout.fillHeight: true
clip: true clip: true
ScrollIndicator.vertical: ScrollIndicator { } // Disabled scrollbars, gives crash on startup on windows
ScrollBar.vertical: ScrollBar { } // uncomment to test // ScrollIndicator.vertical: ScrollIndicator { }
// ScrollBar.vertical: ScrollBar { } // uncomment to test
// Views container // Views container
StackView { StackView {

0
empty Normal file
View file

2
main.cpp
View file

@ -76,7 +76,7 @@ int main(int argc, char *argv[])
// Log settings // Log settings
Monero::Wallet::init(argv[0], "monero-wallet-gui"); Monero::Wallet::init(argv[0], "monero-wallet-gui");
qInstallMessageHandler(messageHandler); // qInstallMessageHandler(messageHandler);
MainApp app(argc, argv); MainApp app(argc, argv);