Merge lines.love
This commit is contained in:
commit
a736e9705b
|
@ -13,8 +13,9 @@ Initializing settings:
|
||||||
- start out editing source, move window, press ctrl+w twice; window is editing source in same position+dimensions
|
- start out editing source, move window, press ctrl+w twice; window is editing source in same position+dimensions
|
||||||
- no log file; switching to source works
|
- no log file; switching to source works
|
||||||
|
|
||||||
- run with an untested version. Error message pops up and waits for a key. The app attempts to continue, and doesn't receive the key.
|
- run with an untested version of LÖVE. Error message pops up and waits for a key. The app attempts to continue, and doesn't receive the key.
|
||||||
- run with a LÖVE v12 release candidate. No errors; it is a supported version. All tests pass.
|
- run with a LÖVE v12 release candidate. No errors; it is a supported version. All tests pass.
|
||||||
|
- create a couple of spuriously failing tests. Run with an untested version of LÖVE. Error message includes message about untested version.
|
||||||
|
|
||||||
Load directory:
|
Load directory:
|
||||||
- clear save dir, run, you get an error message telling you to specify a directory for notes
|
- clear save dir, run, you get an error message telling you to specify a directory for notes
|
||||||
|
@ -159,8 +160,7 @@ Mode interactions:
|
||||||
|
|
||||||
Source editing:
|
Source editing:
|
||||||
* start out in the note-taking app, press ctrl+w to edit source, make a change to the source, press ctrl+w twice to return to the source editor; the change should be preserved.
|
* start out in the note-taking app, press ctrl+w to edit source, make a change to the source, press ctrl+w twice to return to the source editor; the change should be preserved.
|
||||||
* run with an untested version. Error message pops up. Press a key. App comes up, and doesn't receive the key. Press ctrl+w. Error pops up. Press a key. Source editor opens up. Press ctrl+w. Error pops up. Press a key. App returns.
|
* run with an untested version of LÖVE. Error message pops up. Press a key. App comes up, and doesn't receive the key. Press ctrl+w. Error pops up. Press a key. Source editor opens up. Press ctrl+w. Error pops up. Press a key. App returns.
|
||||||
* create a couple of spuriously failing tests. Run with an untested version. Error message includes message about untested version.
|
|
||||||
|
|
||||||
### Other compromises
|
### Other compromises
|
||||||
|
|
||||||
|
|
7
main.lua
7
main.lua
|
@ -222,7 +222,7 @@ function App.keychord_press(chord, key)
|
||||||
Skip_rest_of_key_events = nil
|
Skip_rest_of_key_events = nil
|
||||||
if current_app_is_warning() then
|
if current_app_is_warning() then
|
||||||
if chord == 'C-c' then
|
if chord == 'C-c' then
|
||||||
love.system.setClipboardText(Error_message)
|
love.system.setClipboardText(warning_message())
|
||||||
else
|
else
|
||||||
clear_warning()
|
clear_warning()
|
||||||
Skip_rest_of_key_events = true
|
Skip_rest_of_key_events = true
|
||||||
|
@ -373,3 +373,8 @@ function clear_warning()
|
||||||
assert(type(Current_app) == 'table')
|
assert(type(Current_app) == 'table')
|
||||||
Current_app = Current_app.next_app
|
Current_app = Current_app.next_app
|
||||||
end
|
end
|
||||||
|
|
||||||
|
function warning_message()
|
||||||
|
assert(type(Current_app) == 'table')
|
||||||
|
return Current_app.message
|
||||||
|
end
|
||||||
|
|
Loading…
Reference in New Issue