working but buggy

This commit is contained in:
Brian Jian Zhao 2020-02-21 10:37:58 +11:00
parent 7a0f2c9ce3
commit cb7289d3d8
4 changed files with 30 additions and 26 deletions

View file

@ -84,11 +84,11 @@ const ipc = electron.ipcRenderer;
const localeMessages = ipc.sendSync('locale-data');
window.setScaling = (number) => {
window.setZoomFactor = (number) => {
return webFrame.setZoomFactor(number);
}
window.getScaling = () => {
window.getZoomFactor = () => {
return webFrame.getZoomFactor();
}

View file

@ -88,7 +88,7 @@ export class SessionSettingListItem extends React.Component<Props, State> {
/>
)}
{type === SessionSettingType.Slider && (
{type === SessionSettingType.Slider && title === 'messageTTL' ? (
<div className="slider-wrapper">
<Slider
dots={true}
@ -105,10 +105,25 @@ export class SessionSettingListItem extends React.Component<Props, State> {
<p>{`${currentSliderValue} Hours`}</p>
</div>
</div>
)}
</div>
<div>
See me in here
):type === SessionSettingType.Slider ? (
<div>
<Slider
dots={true}
step={20}
min={60}
max={200}
defaultValue={currentSliderValue}
onAfterChange={sliderValue => {
this.handleSlider(sliderValue);
}}
/>
<div className="slider-info">
<p>{`% ${currentSliderValue} Zoom Level`}</p>
</div>
</div>
):
null}
</div>
</div>
);
@ -128,5 +143,11 @@ export class SessionSettingListItem extends React.Component<Props, State> {
this.setState({
sliderValue: value,
});
if(this.props.title !== 'messageTTL' && this.state.sliderValue!==null) {
window.setZoomFactor(this.state.sliderValue/100)
}
}
}

View file

@ -35,7 +35,6 @@ interface State {
pwdLockError: string | null;
shouldLockSettings: boolean | null;
linkedPubKeys: Array<any>;
scaleValue: number;
}
interface LocalSettingType {
@ -63,7 +62,6 @@ export class SettingsView extends React.Component<SettingsViewProps, State> {
pwdLockError: null,
shouldLockSettings: true,
linkedPubKeys: new Array(),
scaleValue: 200
};
this.settingsViewRef = React.createRef();
@ -74,7 +72,6 @@ export class SettingsView extends React.Component<SettingsViewProps, State> {
this.refreshLinkedDevice = this.refreshLinkedDevice.bind(this);
this.onKeyUp = this.onKeyUp.bind(this);
this.handleScaleChange = this.handleScaleChange.bind(this)
window.addEventListener('keyup', this.onKeyUp);
}
@ -164,11 +161,6 @@ export class SettingsView extends React.Component<SettingsViewProps, State> {
</div>
);
})}
<div style={{width:"100%"}} className="ScaleSliderContainer">
<input onChange={this.handleScaleChange}style={{width:"80%", marginLeft:"15%"}} type="range" min="0" max="200" step="25" className="ScaleSlider" id="ScaleSlider" value={this.state.scaleValue}/>
</div>
<div>Scale: {this.state.scaleValue}</div>
</>
);
}
@ -277,17 +269,6 @@ export class SettingsView extends React.Component<SettingsViewProps, State> {
);
}
public handleScaleChange(event:any):any {
const {value} = event.target;
let scaleVal:number = parseInt(value,10);
this.setState({
scaleValue:scaleVal
})
window.setSettingValue('')
}
public renderSessionInfo(): JSX.Element {
return (
<div className="session-settings__version-info">

2
ts/global.d.ts vendored
View file

@ -11,6 +11,7 @@ interface Window {
mnemonic: any;
clipboard: any;
attemptConnection: any;
setZoomFactor: any;
passwordUtil: any;
userConfig: any;
@ -58,6 +59,7 @@ interface Window {
lokiFeatureFlags: any;
resetDatabase: any;
}
interface Promise<T> {