From 337f0f876d5b7a8375e8061c0ea6ed5c9a514b79 Mon Sep 17 00:00:00 2001 From: Andrei Kortunov Date: Sun, 23 Jul 2017 11:04:58 +0400 Subject: [PATCH 1/2] Fade screen in on a new game start --- apps/openmw/mwstate/statemanagerimp.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/apps/openmw/mwstate/statemanagerimp.cpp b/apps/openmw/mwstate/statemanagerimp.cpp index 68b0e4ecb..14ee5adee 100644 --- a/apps/openmw/mwstate/statemanagerimp.cpp +++ b/apps/openmw/mwstate/statemanagerimp.cpp @@ -146,6 +146,9 @@ void MWState::StateManager::newGame (bool bypass) MWBase::Environment::get().getWorld()->startNewGame (bypass); mState = State_Running; + + MWBase::Environment::get().getWindowManager()->fadeScreenOut(0); + MWBase::Environment::get().getWindowManager()->fadeScreenIn(1); } catch (std::exception& e) { From 16be1e1a846c0c1acf062c4130130fe1484acd27 Mon Sep 17 00:00:00 2001 From: PlutonicOverkill Date: Sun, 23 Jul 2017 20:24:18 +1200 Subject: [PATCH 2/2] Fix occurrence highlighting preferences panel --- apps/opencs/model/prefs/state.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/opencs/model/prefs/state.cpp b/apps/opencs/model/prefs/state.cpp index 618a4bfc9..c87e283a8 100644 --- a/apps/opencs/model/prefs/state.cpp +++ b/apps/opencs/model/prefs/state.cpp @@ -153,11 +153,11 @@ void CSMPrefs::State::declare() declareInt ("error-height", "Initial height of the error panel", 100). setRange (100, 10000); declareBool ("highlight-occurrences", "Highlight other occurrences of selected names", true); + declareColour ("colour-highlight", "Colour of highlighted occurrences", QColor("lightcyan")); declareSeparator(); declareColour ("colour-int", "Highlight Colour: Integer Literals", QColor ("darkmagenta")); declareColour ("colour-float", "Highlight Colour: Float Literals", QColor ("magenta")); declareColour ("colour-name", "Highlight Colour: Names", QColor ("grey")); - declareColour ("colour-highlight", "Highlight Colour: Highlighting", QColor("palegreen")); declareColour ("colour-keyword", "Highlight Colour: Keywords", QColor ("red")); declareColour ("colour-special", "Highlight Colour: Special Characters", QColor ("darkorange")); declareColour ("colour-comment", "Highlight Colour: Comments", QColor ("green"));