merged from master

2019-03-16 23:10:15 +11:00
parent 230ce1840d 445c8299e7
commit bf36f68218
28 changed files with 187 additions and 91 deletions
@@ -441,11 +441,9 @@ void MainWindow::editMenu_About_To_Be_Shown() {
 void MainWindow::setup_menus() {
  QMenuBar* menuBar = new QMenuBar(this);

-  /*
-  menuBar->setStyle(QStyleFactory::create("windowsvista"));
-  menuBar->setPalette(menuBar->style()->standardPalette());
-  menuBar->setStyleSheet("");
-  */
+  if (olive::CurrentConfig.use_native_menu_styling) {
+    OliveGlobal::SetNativeStyling(menuBar);
+  }

  setMenuBar(menuBar);