fix: 🐛 Correctly init global configs

This commit is contained in:
Mikhail Zolotukhin 2021-09-02 13:05:39 +03:00
parent 24d5573149
commit 3b87e93883
7 changed files with 4 additions and 12 deletions

6
src/config.d.ts vendored
View File

@ -19,9 +19,9 @@
// DEALINGS IN THE SOFTWARE.
import IConfig from "./iconfig";
import KWinConfig from "./driver/kwin/kwin_config";
declare global {
var CONFIG: IConfig;
}
// export let CONFIG: IConfig;
var KWINCONFIG: KWinConfig;
}

View File

@ -168,6 +168,3 @@ export default class KWinConfig implements IConfig {
return "Config(" + JSON.stringify(this, undefined, 2) + ")";
}
}
/* HACK: save casting */
export let KWINCONFIG: KWinConfig;

View File

@ -30,7 +30,6 @@ import QuarterLayout from "../../layouts/quarter_layout";
import TilingEngine from "../../engine/tiling_engine";
import TilingController from "../../engine/tiling_controler";
import KWinConfig from "./kwin_config";
import { KWINCONFIG } from "./kwin_config";
import IDriverContext from "../../idriver_context";
import ISurface from "../../isurface";
import Window from "../../engine/window";
@ -140,7 +139,7 @@ export default class KWinDriver implements IDriverContext {
public main() {
console.log("Initiating systems!");
// CONFIG = KWINCONFIG = new KWinConfig();
CONFIG = KWINCONFIG = new KWinConfig();
// debug(() => "Config: " + KWINCONFIG);
// this.bindEvents();

View File

@ -18,7 +18,6 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
import { KWINCONFIG } from "./kwin_config";
import { KWinSetTimeout } from "./kwin_set_timeout";
export default class KWinMousePoller {

View File

@ -21,7 +21,6 @@
import ISurface from "../../isurface";
import { toRect } from "../../util/kwinutil";
import Rect from "../../util/rect";
import { KWINCONFIG } from "./kwin_config";
export default class KWinSurface implements ISurface {
public static generateId(screen: number, activity: string, desktop: number) {

View File

@ -18,7 +18,6 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
import { KWINCONFIG } from "./kwin_config";
import IDriverWindow from "../../idriver_window";
import ISurface from "../../isurface";
import KWinSurface from "./kwin_surface";

View File

@ -24,7 +24,6 @@ import KWinWindow from "../driver/kwin/kwin_window";
import Window from "../engine/window";
// import { CONFIG } from "../config";
import { ILayout } from "../ilayout";
import { KWINCONFIG } from "../driver/kwin/kwin_config";
import { Shortcut } from "../shortcut";
import { WindowState } from "../engine/window";
import Rect from "../util/rect";