diff --git a/docs/api/QPlainTextEdit.md b/docs/api/QPlainTextEdit.md index 3185bb8bd..ad38ae488 100644 --- a/docs/api/QPlainTextEdit.md +++ b/docs/api/QPlainTextEdit.md @@ -54,7 +54,7 @@ Deletes all the text in the text edit.[QPlainTextEdit: clear](https://doc.qt.io/ This property holds the mode QPlainTextEdit will use when wrapping text by words.[QPlainTextEdit: setWordWrapMode](https://doc.qt.io/qt-5/qplaintextedit.html#wordWrapMode-prop). -- mode: WrapMode +- mode: QTextOptionWrapMode #### `plainTextEdit.wordWrapMode()` diff --git a/src/demo.ts b/src/demo.ts index 5dae4c81b..8d72d81b8 100644 --- a/src/demo.ts +++ b/src/demo.ts @@ -10,12 +10,12 @@ import { QWidget, QIcon, QDial, - QPlainTextEdit, - QTextOptionEnums + QPlainTextEdit } from "./index"; import { QScrollArea } from "./lib/QtWidgets/QScrollArea"; import { QPixmap } from "./lib/QtGui/QPixmap"; import { CursorShape, WindowState } from "./lib/QtEnums"; +import { QTextOptionWrapMode } from "./lib/QtGui/QTextOption"; const path = require("path"); @@ -66,7 +66,7 @@ rootView.setLayout(new FlexLayout()); const textEdit = new QPlainTextEdit(); textEdit.setPlainText("Hello"); -textEdit.setWordWrapMode(QTextOptionEnums.WrapMode.NoWrap); +textEdit.setWordWrapMode(QTextOptionWrapMode.NoWrap); const scrollArea = new QScrollArea(); scrollArea.setInlineStyle("flex: 1; width:'100%';"); diff --git a/src/index.ts b/src/index.ts index dd09a5ec8..2dba519f1 100644 --- a/src/index.ts +++ b/src/index.ts @@ -5,7 +5,7 @@ export { QApplication } from "./lib/QtGui/QApplication"; export { QPixmap } from "./lib/QtGui/QPixmap"; export { QIcon } from "./lib/QtGui/QIcon"; export { QCursor } from "./lib/QtGui/QCursor"; -export { QTextOptionEnums } from "./lib/QtGui/QTextOption"; +export { QTextOptionWrapMode } from "./lib/QtGui/QTextOption"; export { QClipboard, QClipboardMode } from "./lib/QtGui/QClipboard"; // Events: Maybe a separate module ? export { QKeyEvent } from "./lib/QtGui/QEvent/QKeyEvent"; diff --git a/src/lib/QtGui/QTextOption/index.ts b/src/lib/QtGui/QTextOption/index.ts index ad0a97e03..184df95fd 100644 --- a/src/lib/QtGui/QTextOption/index.ts +++ b/src/lib/QtGui/QTextOption/index.ts @@ -1,3 +1,7 @@ -import * as Enums from "./textOptionEnums"; - -export const QTextOptionEnums = Enums; +export enum QTextOptionWrapMode { + NoWrap, + WordWrap, + ManualWrap, + WrapAnywhere, + WrapAtWordBoundaryOrAnywhere +} diff --git a/src/lib/QtGui/QTextOption/textOptionEnums.ts b/src/lib/QtGui/QTextOption/textOptionEnums.ts deleted file mode 100644 index 077d3102b..000000000 --- a/src/lib/QtGui/QTextOption/textOptionEnums.ts +++ /dev/null @@ -1,7 +0,0 @@ -export enum WrapMode { - NoWrap, - WordWrap, - ManualWrap, - WrapAnywhere, - WrapAtWordBoundaryOrAnywhere -} diff --git a/src/lib/QtWidgets/QPlainTextEdit/index.ts b/src/lib/QtWidgets/QPlainTextEdit/index.ts index 0858fe9cc..a7d8c288c 100644 --- a/src/lib/QtWidgets/QPlainTextEdit/index.ts +++ b/src/lib/QtWidgets/QPlainTextEdit/index.ts @@ -3,7 +3,7 @@ import { NodeWidget } from "../QWidget"; import { BaseWidgetEvents } from "../../core/EventWidget"; import { NativeElement } from "../../core/Component"; import { QAbstractScrollArea } from "../QAbstractScrollArea"; -import { WrapMode } from "../../QtGui/QTextOption/textOptionEnums"; +import { QTextOptionWrapMode } from "../../QtGui/QTextOption"; export const QPlainTextEditEvents = Object.freeze({ ...BaseWidgetEvents, @@ -59,10 +59,10 @@ export class QPlainTextEdit extends QAbstractScrollArea { // react:✓ this.native.clear(); } - setWordWrapMode(mode: WrapMode) { + setWordWrapMode(mode: QTextOptionWrapMode) { this.native.setWordWrapMode(mode); } - wordWrapMode(): WrapMode { + wordWrapMode(): QTextOptionWrapMode { return this.native.wordWrapMode(); } setLineWrapMode(mode: LineWrapMode) {