aaron/mattermost-desktop
1
0
Fork 0
Code Issues Pull requests Actions 1 Packages Projects Releases Wiki Activity

[MM-43601] Switch upgrade button to an actual button and moved onClick event (#2080) (#2081)

Browse source 
(cherry picked from commit d1ca1188b4)

Co-authored-by: Devin Binnie <52460000+devinbinnie@users.noreply.github.com>
This commit is contained in:
Mattermost Build 2022-04-26 15:18:47 +02:00 committed by GitHub
parent db31ba4799
commit 20b15e9f1d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/renderer/components/MainPage.tsx
View file

@ -426,19 +426,21 @@ export default class MainPage extends React.PureComponent<Props, State> {
let upgradeIcon;
if (this.state.upgradeStatus !== UpgradeStatus.NONE) {
upgradeIcon = (
<span className={classNames('upgrade-btns', {darkMode: this.state.darkMode})}>
<button
className={classNames('upgrade-btns', {darkMode: this.state.darkMode})}
onClick={() => {
if (this.state.upgradeStatus === UpgradeStatus.DOWNLOADING) {
return;
}
window.ipcRenderer.send(this.state.upgradeStatus === UpgradeStatus.DOWNLOADED ? START_UPGRADE : START_DOWNLOAD);
}}
>
<div
className={classNames('button upgrade-button', {
rotate: this.state.upgradeStatus === UpgradeStatus.DOWNLOADING,
})}
title={upgradeTooltip}
onClick={() => {
if (this.state.upgradeStatus === UpgradeStatus.DOWNLOADING) {
return;
}
window.ipcRenderer.send(this.state.upgradeStatus === UpgradeStatus.DOWNLOADED ? START_UPGRADE : START_DOWNLOAD);
}}
>
<i
className={classNames({
@ -449,7 +451,8 @@ export default class MainPage extends React.PureComponent<Props, State> {
/>
{(this.state.upgradeStatus !== UpgradeStatus.DOWNLOADING) && <div className={'circle'}/>}
</div>
</span>);
</button>
);
}
let titleBarButtons;

3
src/renderer/css/components/UpgradeButton.scss
View file

@ -8,6 +8,8 @@
margin-right: 4px;
text-align: center;
color: rgba(63, 67, 80, 0.56);
background: none;
border: none;
&:hover {
background-color: rgba(63, 67, 80, 0.08);
@ -15,7 +17,6 @@
}
.upgrade-button {
margin: 7px;
height: 18px;
cursor: pointer;