Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Apply the user's tint once the MatrixClientPeg is moderately ready #2214

Merged
merged 3 commits into from
Oct 16, 2018
Merged

Apply the user's tint once the MatrixClientPeg is moderately ready #2214

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ebcc65d
Apply the user's tint once the MatrixClientPeg is moderately ready
turt2live Oct 12, 2018
f8fd0c3
Merge branch 'develop' into travis/fix-default-tint
turt2live Oct 15, 2018
6323d78
Move tinter init to MatrixChat
turt2live Oct 15, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/components/structures/MatrixChat.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1403,6 +1403,11 @@ export default React.createClass({
break;
}
});

// Fire the tinter right on startup to ensure the default theme is applied
// A later sync can/will correct the tint to be the right value for the user
const color_scheme = SettingsStore.getValue("roomColor");
Tinter.tint(color_scheme.primary_color, color_scheme.secondary_color);
},

/**
Expand Down