about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorKartik K. Agaram <vc@akkartik.com>2024-09-10 20:06:02 -0700
committerKartik K. Agaram <vc@akkartik.com>2024-09-10 20:06:02 -0700
commit2ea70f3adfcd1cc8fc60ed05c57fbba9f5faf38f (patch)
treee9f3661a9739816270ba7af67b91c0734f694f38
parentc4019777bbb2f302799fd46fa808bd6d6126d6cc (diff)
parent46cd42ecdc05d5fddb125ed4494b79ecccbfebba (diff)
downloadview.love-2ea70f3adfcd1cc8fc60ed05c57fbba9f5faf38f.tar.gz
Merge text.love
-rw-r--r--edit.lua1
-rw-r--r--main.lua1
-rw-r--r--run.lua1
-rw-r--r--source.lua1
-rw-r--r--source_edit.lua1
5 files changed, 2 insertions, 3 deletions
diff --git a/edit.lua b/edit.lua
index 8d47e86..16f0321 100644
--- a/edit.lua
+++ b/edit.lua
@@ -125,7 +125,6 @@ function edit.quit(State)
 end
 
 function edit.mouse_press(State, x,y, mouse_button)
-  love.keyboard.setTextInput(true)  -- bring up keyboard on touch screen
   if State.search_term then return end
   State.mouse_down = mouse_button
 --?   print_and_log(('edit.mouse_press: cursor at %d,%d'):format(State.cursor1.line, State.cursor1.pos))
diff --git a/main.lua b/main.lua
index 582f05a..e7d35f4 100644
--- a/main.lua
+++ b/main.lua
@@ -114,7 +114,6 @@ function check_love_version_for_tests()
 end
 
 function App.initialize(arg)
-  love.keyboard.setTextInput(true)  -- bring up keyboard on touch screen
   love.keyboard.setKeyRepeat(true)
 
   love.graphics.setBackgroundColor(1,1,1)
diff --git a/run.lua b/run.lua
index 6ad9a01..db572ee 100644
--- a/run.lua
+++ b/run.lua
@@ -168,6 +168,7 @@ end
 
 function run.mouse_press(x,y, mouse_button)
   Cursor_time = 0  -- ensure cursor is visible immediately after it moves
+  love.keyboard.setTextInput(true)  -- bring up keyboard on touch screen
   return edit.mouse_press(Editor_state, x,y, mouse_button)
 end
 
diff --git a/source.lua b/source.lua
index 7eec594..6b35fc6 100644
--- a/source.lua
+++ b/source.lua
@@ -285,6 +285,7 @@ end
 
 function source.mouse_press(x,y, mouse_button)
   Cursor_time = 0  -- ensure cursor is visible immediately after it moves
+  love.keyboard.setTextInput(true)  -- bring up keyboard on touch screen
 --?   print('mouse click', x, y)
 --?   print(Editor_state.left, Editor_state.right)
 --?   print(Log_browser_state.left, Log_browser_state.right)
diff --git a/source_edit.lua b/source_edit.lua
index 2dca05d..53bd16a 100644
--- a/source_edit.lua
+++ b/source_edit.lua
@@ -234,7 +234,6 @@ function edit.quit(State)
 end
 
 function edit.mouse_press(State, x,y, mouse_button)
-  love.keyboard.setTextInput(true)  -- bring up keyboard on touch screen
   if State.search_term then return end
   State.mouse_down = mouse_button
 --?   print_and_log(('edit.mouse_press: cursor at %d,%d'):format(State.cursor1.line, State.cursor1.pos))
web.de> 2014-05-12 11:12:37 +0200 committer Araq <rumpf_a@web.de> 2014-05-12 11:12:37 +0200 initial non-compiling version of 'parallel'' href='/ahoang/Nim/commit/lib/pure/concurrency/cpuload.nim?h=devel&id=6195dbe491ccd864c5dcb59f87826291ac1f1ff4'>6195dbe49 ^
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98