Skip to content

Commit e087919

Browse files
Merge pull request #589 from proletesseract/521-osx-png-bug
OSX pink menu bug
2 parents f449aec + cc41912 commit e087919

18 files changed

+21
-11
lines changed

.gitignore

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,3 +139,13 @@ ui_*.h
139139
*.cflags
140140
*.cxxflags
141141
*.creator.*
142+
143+
craig-core.files
144+
145+
craig-core.includes
146+
147+
navcoin-core.code-workspace
148+
149+
craig-core.config
150+
151+
craig-core.creator

src/qt/navcoingui.cpp

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -606,25 +606,25 @@ void NavCoinGUI::createToolBars()
606606
topMenuLogo->setFixedSize(187,94);
607607
topMenuLogo->setObjectName("navLogo");
608608
topMenuLogo->setStyleSheet(
609-
"#navLogo { border-image: url(:/icons/menu_logo) 0 0 0 0 stretch stretch; border: 0px; }");
609+
"#navLogo { background: url(:/icons/menu_logo) bottom center #eee; border: 0; }");
610610

611611
topMenu1 = new QPushButton();
612612
walletFrame->menuLayout->addWidget(topMenu1);
613613
topMenu1->setFixedSize(139,94);
614614
topMenu1->setObjectName("topMenu1");
615615
connect(topMenu1, SIGNAL(clicked()), this, SLOT(gotoOverviewPage()));
616616
topMenu1->setStyleSheet(
617-
"#topMenu1 { border-image: url(:/icons/menu_home_ns) 0 0 0 0 stretch stretch; border: 0px; }"
618-
"#topMenu1:hover { border-image: url(:/icons/menu_home_hover) 0 0 0 0 stretch stretch; border: 0px; }");
617+
"#topMenu1 { background: url(:/icons/menu_home_ns) bottom center #eee; border: 0; }"
618+
"#topMenu1:hover { background: url(:/icons/menu_home_hover) bottom center #ddd; border: 0; }");
619619

620620
topMenu2 = new QPushButton();
621621
walletFrame->menuLayout->addWidget(topMenu2);
622622
topMenu2->setFixedSize(144,94);
623623
topMenu2->setObjectName("topMenu2");
624624
connect(topMenu2, SIGNAL(clicked()), this, SLOT(gotoSendCoinsPage()));
625625
topMenu2->setStyleSheet(
626-
"#topMenu2 { border-image: url(:/icons/menu_send_ns) 0 0 0 0 stretch stretch; border: 0px; }"
627-
"#topMenu2:hover { border-image: url(:/icons/menu_send_hover) 0 0 0 0 stretch stretch; border: 0px; }");
626+
"#topMenu2 { background: url(:/icons/menu_send_ns) bottom center #eee; border: 0; }"
627+
"#topMenu2:hover { background: url(:/icons/menu_send_hover) bottom center #ddd; border: 0; }");
628628

629629
topMenu3 = new QPushButton();
630630
walletFrame->menuLayout->addWidget(topMenu3);
@@ -633,25 +633,25 @@ void NavCoinGUI::createToolBars()
633633
connect(topMenu3, SIGNAL(clicked()), this, SLOT(gotoRequestPaymentPage()));
634634
topMenu3->move(469,0);
635635
topMenu3->setStyleSheet(
636-
"#topMenu3 { border-image: url(:/icons/menu_receive_ns) 0 0 0 0 stretch stretch; border: 0px; }"
637-
"#topMenu3:hover { border-image: url(:/icons/menu_receive_hover) 0 0 0 0 stretch stretch; border: 0px; }");
636+
"#topMenu3 { background: url(:/icons/menu_receive_ns) bottom center #eee; border: 0; }"
637+
"#topMenu3:hover { background: url(:/icons/menu_receive_hover) bottom center #ddd; border: 0; }");
638638

639639
topMenu4 = new QPushButton();
640640
walletFrame->menuLayout->addWidget(topMenu4);
641641
topMenu4->setFixedSize(215,94);
642642
topMenu4->setObjectName("topMenu4");
643643
connect(topMenu4, SIGNAL(clicked()), this, SLOT(gotoHistoryPage()));
644644
topMenu4->setStyleSheet(
645-
"#topMenu4 { border-image: url(:/icons/menu_transaction_ns) 0 0 0 0 stretch stretch; border: 0px; }"
646-
"#topMenu4:hover { border-image: url(:/icons/menu_transaction_hover) 0 0 0 0 stretch stretch; border: 0px; }");
645+
"#topMenu4 { background: url(:/icons/menu_transaction_ns) bottom center #eee; border: 0; }"
646+
"#topMenu4:hover { background: url(:/icons/menu_transaction_hover) bottom center #ddd; border: 0; }");
647647
topMenu5 = new QPushButton();
648648
walletFrame->menuLayout->addWidget(topMenu5);
649649
topMenu5->setFixedSize(215,94);
650650
topMenu5->setObjectName("topMenu5");
651651
connect(topMenu5, SIGNAL(clicked()), this, SLOT(gotoCommunityFundPage()));
652652
topMenu5->setStyleSheet(
653-
"#topMenu5 { border-image: url(:/icons/menu_community_fund_ns) 0 0 0 0 stretch stretch; border: 0px; }"
654-
"#topMenu5:hover { border-image: url(:/icons/menu_community_fund_hover) 0 0 0 0 stretch stretch; border: 0px; }");
653+
"#topMenu5 { background: url(:/icons/menu_community_fund_ns) bottom center #eee; border: 0; }"
654+
"#topMenu5:hover { background: url(:/icons/menu_community_fund_hover) bottom center #ddd; border: 0; }");
655655
QWidget *topMenu = new QWidget();
656656
topMenu->setObjectName("topMenu");
657657
topMenu->setStyleSheet(
-2.49 KB
Loading
-2.46 KB
Loading
391 Bytes
Loading

src/qt/res/icons/home_hover.png

601 Bytes
Loading

src/qt/res/icons/home_ns.png

-1.68 KB
Loading

src/qt/res/icons/home_s.png

1.13 KB
Loading

src/qt/res/icons/logo_ns.png

-11.7 KB
Loading

src/qt/res/icons/receive_hover.png

381 Bytes
Loading

0 commit comments

Comments
 (0)