diff --git a/qml/ClideEditor.qml b/qml/ClideEditor.qml index 9ab7f5e..32951eb 100644 --- a/qml/ClideEditor.qml +++ b/qml/ClideEditor.qml @@ -10,7 +10,7 @@ import clide.module 1.0 import Logger 1.0 Rectangle { - color: "transparent" + color: RustColors.editor_background RowLayout { anchors.fill: parent diff --git a/qml/ClideExplorerView.qml b/qml/ClideExplorerView.qml index 7c49cf0..4a17d6b 100644 --- a/qml/ClideExplorerView.qml +++ b/qml/ClideExplorerView.qml @@ -14,11 +14,11 @@ Rectangle { required property string projectDir + signal fileClicked(string path) + clip: true color: RustColors.explorer_background - radius: 20 - - signal fileClicked(string path) + topLeftRadius: 10 ColumnLayout { anchors.fill: parent diff --git a/qml/ClideLogger.qml b/qml/ClideLogger.qml index b6b2948..367ece8 100644 --- a/qml/ClideLogger.qml +++ b/qml/ClideLogger.qml @@ -9,11 +9,12 @@ import clide.module 1.0 import Logger 1.0 Rectangle { - color: "#111" + color: RustColors.terminal_background radius: 10 ListModel { id: model + } ListView { id: listView diff --git a/qml/ClideMenuBar.qml b/qml/ClideMenuBar.qml index b3b8c35..cfd9518 100644 --- a/qml/ClideMenuBar.qml +++ b/qml/ClideMenuBar.qml @@ -11,7 +11,6 @@ MenuBar { // Background for this MenuBar. background: Rectangle { color: RustColors.menubar - radius: 20.0 } // diff --git a/qml/main.qml b/qml/main.qml index de53192..e0a07e2 100644 --- a/qml/main.qml +++ b/qml/main.qml @@ -22,8 +22,22 @@ ApplicationWindow { menuBar: ClideMenuBar { } - ClideApplicationView { - projectDir: appWindow.appContextPath + Rectangle { + color: RustColors.menubar + width: appView.implicitWidth + height: appView.implicitHeight + + ClideApplicationView { + id: appView + projectDir: appWindow.appContextPath + implicitHeight: appWindow.height + implicitWidth: appWindow.width + + anchors.right: parent.right + anchors.bottom: parent.bottom + anchors.leftMargin: 20 + anchors.topMargin: 10 + } } } diff --git a/src/gui/colors.rs b/src/gui/colors.rs index c7ff925..9fb5ab3 100644 --- a/src/gui/colors.rs +++ b/src/gui/colors.rs @@ -93,7 +93,7 @@ impl Default for RustColorsImpl { linenumber: QColor::try_from("#94989b").unwrap(), active: QColor::try_from("#a9acb0").unwrap(), inactive: QColor::try_from("#FFF").unwrap(), - editor_background: QColor::try_from("#111111").unwrap(), + editor_background: QColor::try_from("#1E1F22").unwrap(), editor_text: QColor::try_from("#acaea3").unwrap(), editor_highlighted_text: QColor::try_from("#ccced3").unwrap(), editor_highlight: QColor::try_from("#ccced3").unwrap(),