Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions ghosteel.pro
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,13 @@ HEADERS += \
src/ghosttyvt.h \
src/glrenderer.h \
src/glyphatlas.h \
src/ipcmessage.h \
src/keymapping.h \
src/kittyimagedecoder.h \
src/ptymanager.h \
src/scrollencryptor.h \
src/sessionmanager.h \
src/sessionstore.h \
src/settings.h \
src/terminalview.h \
src/textutil.h
Expand All @@ -74,14 +76,23 @@ SOURCES += \
src/ghosteeladapter.cpp \
src/ghosttyvt.cpp \
src/glrenderer.cpp \
src/glrenderer_geometry.cpp \
src/glrenderer_kitty.cpp \
src/glrenderer_pipeline.cpp \
src/glrenderer_shaders.cpp \
src/glyphatlas.cpp \
src/keymapping.cpp \
src/kittyimagedecoder.cpp \
src/ptymanager.cpp \
src/scrollencryptor.cpp \
src/sessionmanager.cpp \
src/sessionstore.cpp \
src/settings.cpp \
src/singleinstance.cpp \
src/terminalview.cpp \
src/terminalview_links.cpp \
src/terminalview_search.cpp \
src/terminalview_touch.cpp \
src/textutil.cpp

DISTFILES += qml/ghosteel.qml \
Expand Down
4 changes: 2 additions & 2 deletions qml/pages/SettingsPage.qml
Original file line number Diff line number Diff line change
Expand Up @@ -121,8 +121,8 @@ Page {
id: fontSlider
width: parent.width
label: qsTr("Default font size")
minimumValue: 6
maximumValue: 32
minimumValue: Settings.minFontSize
maximumValue: Settings.maxFontSize
stepSize: 1
value: Settings.fontSize
valueText: {
Expand Down
8 changes: 4 additions & 4 deletions qml/pages/TerminalPage.qml
Original file line number Diff line number Diff line change
Expand Up @@ -713,7 +713,7 @@ Page {
function onZoomRequested(delta) {
if (!terminal) return
SessionManager.setActiveSessionFontSize(
Math.max(6, Math.min(32, terminal.fontSize + delta)), false)
Math.max(Settings.minFontSize, Math.min(Settings.maxFontSize, terminal.fontSize + delta)), false)
}

function onPinchingChanged(pinching) {
Expand Down Expand Up @@ -1158,7 +1158,7 @@ Page {
Rectangle {
anchors.left: parent.left
anchors.verticalCenter: parent.verticalCenter
width: parent.width * Math.max(0, Math.min(1, ((terminal ? terminal.fontSize : 6) - 6) / (32 - 6)))
width: parent.width * Math.max(0, Math.min(1, ((terminal ? terminal.fontSize : Settings.minFontSize) - Settings.minFontSize) / (Settings.maxFontSize - Settings.minFontSize)))
height: parent.height
radius: height / 2
color: Theme.highlightColor
Expand Down Expand Up @@ -1255,9 +1255,9 @@ Page {
var dir = keyDef.id === "prevSession" ? -1 : 1
switchSession(dir)
} else if (keyDef.id === "zoomIn") {
SessionManager.setActiveSessionFontSize(Math.min(32, terminal.fontSize + 1), false)
SessionManager.setActiveSessionFontSize(Math.min(Settings.maxFontSize, terminal.fontSize + 1), false)
} else if (keyDef.id === "zoomOut") {
SessionManager.setActiveSessionFontSize(Math.max(6, terminal.fontSize - 1), false)
SessionManager.setActiveSessionFontSize(Math.max(Settings.minFontSize, terminal.fontSize - 1), false)
}
}

Expand Down
Loading
Loading