Skip to content

Commit

Permalink
## 0.5.22 (2020-03-08)
Browse files Browse the repository at this point in the history
- add dialog spawn position as general setting (Cursor, Center) (#210)
- update data to 3.9.3
- remove hotkeys dependency (#261)
- fix timeless jewels missing keystone (#274)
- fix `waterways map of vulnerablity` mismatched with `vulnerablitity skill gem` (#268)
  • Loading branch information
Kyusung4698 committed Mar 8, 2020
1 parent fb81160 commit b7c4bea
Show file tree
Hide file tree
Showing 7 changed files with 30 additions and 29 deletions.
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
## 0.5.22 (2020-03-01)
## 0.5.22 (2020-03-08)

- add relaunch button (#275)
- add dialog spawn position as general setting (Cursor, Center) (#210)
- update data to 3.9.3
- remove hotkeys dependency (#261)
- fix timeless jewels missing keystone (#274)
- fix `waterways map of vulnerablity` mismatched with `vulnerablitity skill gem` (#268)
Expand Down
4 changes: 2 additions & 2 deletions hook.ts
Original file line number Diff line number Diff line change
Expand Up @@ -107,14 +107,14 @@ export function register(): void {
iohook.on('keydown', onKeydown);
iohook.on('keyup', onKeyup);
iohook.on('mousewheel', onMousewheel);
iohook.on('mouseclick', onMouseclick);
iohook.on('mouseup', onMouseclick);
}

export function unregister(): void {
iohook.off('keydown', onKeydown);
iohook.off('keyup', onKeyup);
iohook.off('mousewheel', onMousewheel);
iohook.off('mouseclick', onMouseclick);
iohook.off('mouseup', onMouseclick);

if (activeCheckSubscription) {
activeCheckSubscription.unsubscribe();
Expand Down
15 changes: 8 additions & 7 deletions main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -199,13 +199,14 @@ function createTray(): Tray {
label: 'Reset Zoom', type: 'normal',
click: () => win.webContents.send('reset-zoom'),
},
{
label: 'Relaunch', type: 'normal',
click: () => {
app.relaunch();
app.exit(0);
}
},
// TODO: Does not work with compiled app.
// {
// label: 'Relaunch', type: 'normal',
// click: () => {
// app.relaunch();
// app.quit();
// }
// },
{
label: 'Exit', type: 'normal',
click: () => app.quit()
Expand Down
26 changes: 12 additions & 14 deletions src/app/core/service/app.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { ElectronProvider } from '@app/provider';
import { VisibleFlag } from '@app/type/app.type';
import { IpcRenderer, Remote } from 'electron';
import { BehaviorSubject, combineLatest, Observable } from 'rxjs';
import { debounceTime, map } from 'rxjs/operators';
import { map } from 'rxjs/operators';
import { DialogRefService } from './dialog/dialog-ref.service';

@Injectable({
Expand All @@ -30,18 +30,16 @@ export class AppService {
return combineLatest([
this.activeChange$,
this.dialogRef.dialogCountChange()
]).pipe(
map(([game, dialogCount]) => {
let result = VisibleFlag.None;
if (game) {
result |= VisibleFlag.Game;
}
if (dialogCount > 0) {
result |= VisibleFlag.Dialog;
}
return result;
}),
debounceTime(250));
]).pipe(map(([game, dialogCount]) => {
let result = VisibleFlag.None;
if (game) {
result |= VisibleFlag.Game;
}
if (dialogCount > 0) {
result |= VisibleFlag.Dialog;
}
return result;
}));
}

public triggerVisibleChange(): void {
Expand All @@ -63,6 +61,6 @@ export class AppService {
*/
public relaunch(): void {
this.electron.app.relaunch();
this.electron.app.exit(0);
this.electron.app.quit();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
</mat-card>
<mat-card>
<mat-dialog-actions align="center">
<button mat-button (click)="relaunchApp()">
<button mat-button (click)="relaunchApp()" disabled>
{{'settings.relaunch-app' | translate}}
</button>
<button mat-button (click)="exitApp()">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { ChangeDetectionStrategy, Component, Input, OnInit } from '@angular/core';
import { EnumValues } from '@app/class';
import { AppService } from '@app/service';
import { LeaguesProvider } from '@shared/module/poe/provider';
import { Language, League } from '@shared/module/poe/type';
import { BehaviorSubject } from 'rxjs';
import { UserSettings } from '../../type';
import { AppService } from '@app/service';

@Component({
selector: 'app-user-settings-form',
Expand All @@ -20,7 +20,7 @@ export class UserSettingsFormComponent implements OnInit {
public settings: UserSettings;

constructor(private readonly leaguesProvider: LeaguesProvider,
private readonly app: AppService) { }
private readonly app: AppService) { }

public ngOnInit(): void {
if (this.settings.language) {
Expand All @@ -43,7 +43,8 @@ export class UserSettingsFormComponent implements OnInit {
}

public relaunchApp(): void {
this.app.relaunch();
// TODO: Does not work with compiled app.
// this.app.relaunch();
}

public exitApp(): void {
Expand Down
1 change: 1 addition & 0 deletions src/assets/poe/maps.json
Original file line number Diff line number Diff line change
Expand Up @@ -1370,6 +1370,7 @@
"items": [
"The Gambler",
"The Encroaching Darkness",
"Vessel of Vinktar",
"The Iron Bard",
"Monochrome"
],
Expand Down

0 comments on commit b7c4bea

Please sign in to comment.