Merge pull request RAJAGOPALAN-GANGADHARAN#49 from RAJAGOPALAN-GANGADHARAN/aritroCoder/rebased

Resolves Fullscreen toggle bug

Author: RAJAGOPALAN-GANGADHARAN

.gitignore

@@ -20,4 +20,4 @@ npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
 
-package-lock.json
+/package-lock.json

src/desktop/desktop.js

@@ -25,19 +25,11 @@ export default class Desktop extends Component
         */
         //bind
         this.backgroundSetter=this.backgroundSetter.bind(this);
-        this.goFullScreen=this.goFullScreen.bind(this);
-        //this.adder=this.adder.bind(this);
-        //this.closer=this.closer.bind(this);
         this.state={
             bgimage:null,isFull:false,visible:false,desktopIcons:null
         };
 
     }
-    goFullScreen()
-    {
-        this.setState({ isFull: true });
-    }
-    
     getWidgets()
     {
         let wtemp=[]
@@ -62,7 +54,7 @@ export default class Desktop extends Component
         for (var fcnt in currDisk.folderContents) {
             let currentObject = currDisk.folderContents[fcnt];
             console.log(xaxis,yaxis)
-            if (currentObject.isFolder == true) {
+            if (currentObject.isFolder === true) {
                 let currentName = currentObject.folderName;
                 rightPaneHolder.push(
                     <div className="iconHolderDesktop" style={{ top: `${yaxis}px`,left:`${xaxis}px` }} onClick={() => { eventDispatcher('Explorer',null,currentObject) }}>
@@ -119,8 +111,8 @@ export default class Desktop extends Component
     render()
     {
         return(
-            <Fullscreen enabled={this.state.isFull} onChange={isFull => this.setState({isFull})}>
-                <ContextMenu />
+            <Fullscreen enabled={this.state.isFull}>
+                <ContextMenu />              
                 <div id="emptyDragclass"></div>
                 <div id="launcher">
                 </div>

src/desktop/notification/notification.js

@@ -1,27 +1,23 @@
-import React,{Component} from 'react';
+import React, { Component } from 'react';
 import './notification.css';
 import Status from './statusicons/status';
-import {theme_color_panels,notify_status} from '../../globalvariables';
-import { FaExpand,FaBell, FaGithub, FaLinkedin, FaEnvelope, FaAt, FaStar } from 'react-icons/fa';
+import { theme_color_panels, notify_status } from '../../globalvariables';
+import { FaExpand, FaBell, FaGithub, FaLinkedin, FaEnvelope, FaAt, FaStar } from 'react-icons/fa';
 
-export default class Panel extends Component
-{
-    constructor(props)
-    {
+export default class Panel extends Component {
+    constructor(props) {
         super(props);
-        this.expand=this.expand.bind(this);
-        this.state={panelcolor:theme_color_panels,paneltype:'solid'};
+        this.expand = this.expand.bind(this);
+        this.state = { panelcolor: theme_color_panels, paneltype: 'solid' };
     }
-    expand()
-    {
-        this.props.parent_class.setState({ isFull: true });
+
+    expand() {
+        this.props.parent_class.setState({ isFull: !this.props.parent_class.state.isFull })
     }
-    nullBind()
-    {
+    nullBind() {
 
     }
-    gitHubIcon=()=>
-    {
+    gitHubIcon = () => {
         window.open("https://github.com/RAJAGOPALAN-GANGADHARAN/", "_blank")
     }
     linkedin = () => {
@@ -33,16 +29,15 @@ export default class Panel extends Component
     repo = () => {
         window.open("https://github.com/RAJAGOPALAN-GANGADHARAN/JS-OS", "_blank");
     }
-    render()
-    {
-        return(
-            <div id="notificationpanel" style={{backgroundColor:this.state.panelcolor}}>
-            <Status icon={<FaExpand/>} event={this.expand} styles="expand_icon"/>
+    render() {
+        return (
+            <div id="notificationpanel" style={{ backgroundColor: this.state.panelcolor }}>
+                <Status icon={<FaExpand />} event={this.expand} styles="expand_icon" />
                 {notify_status ? (<Status icon={<FaBell />} event={this.nullBind} />) : (<Status icon={<FaBell />} event={this.nullBind} />)}
                 <Status icon={<FaGithub />} event={this.gitHubIcon} />
                 <Status icon={<FaLinkedin />} event={this.linkedin} />
                 <Status icon={<FaAt />} event={this.mailto} />
-                <Status icon={<FaStar/>} event={this.repo}/>
+                <Status icon={<FaStar />} event={this.repo} />
             </div>
         )
     }