Skip to content

Fix font size and add line height #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Fix font size and add line height #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c09b052
Fix font size by set viewport
gewill Apr 28, 2023
7ee97d7
Add line-height
gewill Apr 28, 2023
5c1057f
Fix lineHeight spell
gewill Apr 28, 2023
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
4 changes: 4 additions & 0 deletions Sources/CodeViewer/CodeViewer.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ public struct CodeViewer: ViewRepresentable {
private let lightTheme: CodeWebView.Theme
private let isReadOnly: Bool
private let fontSize: Int
private let lineHeight: Float

public init(
content: Binding<String>,
Expand All @@ -29,6 +30,7 @@ public struct CodeViewer: ViewRepresentable {
lightTheme: CodeWebView.Theme = .solarized_light,
isReadOnly: Bool = false,
fontSize: Int = 12,
lineHeight: Float = 1.3,
textDidChanged: ((String) -> Void)? = nil
) {
self._content = content
Expand All @@ -37,6 +39,7 @@ public struct CodeViewer: ViewRepresentable {
self.lightTheme = lightTheme
self.isReadOnly = isReadOnly
self.fontSize = fontSize
self.lineHeight = lineHeight
self.textDidChanged = textDidChanged
}

Expand All @@ -50,6 +53,7 @@ public struct CodeViewer: ViewRepresentable {
codeView.setReadOnly(isReadOnly)
codeView.setMode(mode)
codeView.setFontSize(fontSize)
codeView.setLineHeight(lineHeight)

codeView.setContent(content)
codeView.clearSelection()
Expand Down
5 changes: 5 additions & 0 deletions Sources/CodeViewer/CodeWebView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,6 +332,11 @@ public class CodeWebView: CustomView {
callJavascript(javascriptString: script)
}

func setLineHeight(_ lineHeight: Float) {
let script = "document.getElementById('editor').style.lineHeight='\(lineHeight)';"
callJavascript(javascriptString: script)
}

func clearSelection() {
let script = "editor.clearSelection();"
callJavascript(javascriptString: script)
Expand Down
2 changes: 2 additions & 0 deletions Sources/CodeViewer/Resources/ace.bundle/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
<!DOCTYPE html>
<html lang="en">
<head>
<!-- Set viewport. -->
<meta name="viewport" content="initial-scale=1">
<title>ACE in Action</title>
<style type="text/css" media="screen">
#editor {
Expand Down