Skip to content

Commit

Permalink
Merge pull request #55 from lacymorrow/fix-54
Browse files Browse the repository at this point in the history
  • Loading branch information
lacymorrow committed Feb 19, 2021
2 parents a2dc070 + c8191a5 commit a82f262
Show file tree
Hide file tree
Showing 11 changed files with 604 additions and 477 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "crossover",
"productName": "CrossOver",
"version": "1.1.1",
"version": "1.1.2-0",
"description": "A Crosshair Overlay for any screen",
"license": "MIT",
"repository": "lacymorrow/crossover",
Expand Down
7 changes: 6 additions & 1 deletion readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -105,12 +105,13 @@ Other crosshair programs offer a single style or color option, and often don't a

Description | Keys
-----------------------| -----------------------
Move the crosshair a single pixel | <kbd>Control</kbd>-<kbd>Alt</kbd>-<kbd>Shift</kbd>-<kbd>Arrows</kbd>
Toggle the settings window and lock the crosshair in place | <kbd>Control</kbd>-<kbd>Alt</kbd>-<kbd>Shift</kbd>-<kbd>X</kbd>
Quickly hide/show the application | <kbd>Control</kbd>-<kbd>Alt</kbd>-<kbd>Shift</kbd>-<kbd>H</kbd>
Center the crosshair window | <kbd>Control</kbd>-<kbd>Alt</kbd>-<kbd>Shift</kbd>-<kbd>C</kbd>
Duplicate your crosshair in a shadow window | <kbd>Control</kbd>-<kbd>Alt</kbd>-<kbd>Shift</kbd>-<kbd>D</kbd>
Reset all settings and center the window | <kbd>Control</kbd>-<kbd>Alt</kbd>-<kbd>Shift</kbd>-<kbd>R</kbd>
Display the "About" window details | <kbd>Control</kbd>-<kbd>Alt</kbd>-<kbd>Shift</kbd>-<kbd>A</kbd>
Move the crosshair a single pixel | <kbd>Control</kbd>-<kbd>Alt</kbd>-<kbd>Shift</kbd>-<kbd>Arrows</kbd>

###### Mac: the <kbd>Option</kbd> key is used instead of <kbd>Alt</kbd>.
###### Linux: Some distributions do not center on double-click.
Expand All @@ -124,6 +125,10 @@ Move the crosshair a single pixel | <kbd>Control</kbd>-
<img width="120" height="120" src="https://github.com/lacymorrow/crossover/raw/master/src/static/crosshairs/Actual/bull-ring-post.png">
</p>

##### Duplicate crosshairs (Beta)

Duplicate crosshair windows use the same settings as the main window and do not support all of the features of the main window. Settings for duplicate crosshairs will not be saved and all duplicate windows will be closed if the main window is closed.

---


Expand Down
4 changes: 4 additions & 0 deletions src/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ const config = new Store( {
const APP_HEIGHT = 124
const CHILD_WINDOW_OFFSET = 25

const MAX_SHADOW_WINDOWS = 20

const SUPPORTED_IMAGE_FILE_TYPES = [ '.bmp', '.jpg', '.jpeg', '.png', '.gif', '.webp' ]

module.exports = {
Expand All @@ -39,5 +41,7 @@ module.exports = {
APP_HEIGHT,
CHILD_WINDOW_OFFSET,

MAX_SHADOW_WINDOWS,

SUPPORTED_IMAGE_FILE_TYPES
}
2 changes: 1 addition & 1 deletion src/index.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit a82f262

Please sign in to comment.