Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
jobily
ScreenToGif
提交
9b4989d9
S
ScreenToGif
项目概览
jobily
/
ScreenToGif
上一次同步 8 个月
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
S
ScreenToGif
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
9b4989d9
编写于
7月 01, 2021
作者:
N
Nicke Manarin
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'dev'
上级
27a34052
0cfd63f6
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
24 addition
and
26 deletion
+24
-26
ScreenToGif/Properties/AssemblyInfo.cs
ScreenToGif/Properties/AssemblyInfo.cs
+2
-2
ScreenToGif/Readme.md
ScreenToGif/Readme.md
+4
-10
ScreenToGif/Util/EncodingManager.cs
ScreenToGif/Util/EncodingManager.cs
+1
-1
ScreenToGif/Util/Other.cs
ScreenToGif/Util/Other.cs
+0
-5
ScreenToGif/Windows/Editor.xaml.cs
ScreenToGif/Windows/Editor.xaml.cs
+3
-4
ScreenToGif/Windows/Other/Startup.xaml.cs
ScreenToGif/Windows/Other/Startup.xaml.cs
+1
-2
ScreenToGif/Windows/Recorder.xaml.cs
ScreenToGif/Windows/Recorder.xaml.cs
+12
-1
ScreenToGif/app.manifest
ScreenToGif/app.manifest
+1
-1
未找到文件。
ScreenToGif/Properties/AssemblyInfo.cs
浏览文件 @
9b4989d9
...
@@ -50,5 +50,5 @@ using System.Windows;
...
@@ -50,5 +50,5 @@ using System.Windows;
// You can specify all the values or you can default the Build and Revision Numbers
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
// [assembly: AssemblyVersion("1.0.*")]
[
assembly
:
AssemblyVersion
(
"2.32.
0
.0"
)]
[
assembly
:
AssemblyVersion
(
"2.32.
1
.0"
)]
[
assembly
:
AssemblyFileVersion
(
"2.32.
0
.0"
)]
[
assembly
:
AssemblyFileVersion
(
"2.32.
1
.0"
)]
ScreenToGif/Readme.md
浏览文件 @
9b4989d9
...
@@ -4,20 +4,14 @@ This is the current project of ScreenToGif.
...
@@ -4,20 +4,14 @@ This is the current project of ScreenToGif.
_VS 2019 and .Net 4.8 or newer required._
_VS 2019 and .Net 4.8 or newer required._
## What's new? (Version 2.32)
## What's new? (Version 2.32
.1
)
• Memory usage improvements with the frame list inside the editor.
• Nothing yet.
• You can now open the app and start recording by using command line arguments (read the wiki for more details).
• Added option to set the background of the editor to follow the OS color theme (thanks to @pawlos).
• Added option to resize the frames by setting a percentage.
### Fixed:
### Fixed:
♦ The selection adorner could appear in the recording if the region was previously left close to the right corner of the screen.
♦ The recorder window could crash because of a sizing issue.
♦ The new recorder UI command panel was getting in the way of the capture when positioned to the left of the capture region.
♦ It was not possible to properly move frames in the timeline.
♦ The insert window was reporting wrong sizing information about the images and canvas.
♦ The new recorder UI was width and height text boxes were not displaying the correct scaled size based on the screen DPI.
♦ When exporting and not selecting a file path, the filename of the temporary file was not using the extension (thanks to @pawlos).
### Known Bugs:
### Known Bugs:
...
...
ScreenToGif/Util/EncodingManager.cs
浏览文件 @
9b4989d9
...
@@ -914,7 +914,7 @@ namespace ScreenToGif.Util
...
@@ -914,7 +914,7 @@ namespace ScreenToGif.Util
}
}
case
Export
.
Jpeg
:
case
Export
.
Jpeg
:
{
{
using
(
var
fileStream
=
new
FileStream
(
frame
.
P
ath
,
FileMode
.
Create
))
using
(
var
fileStream
=
new
FileStream
(
p
ath
,
FileMode
.
Create
))
{
{
var
jpgEncoder
=
new
JpegBitmapEncoder
{
QualityLevel
=
100
};
var
jpgEncoder
=
new
JpegBitmapEncoder
{
QualityLevel
=
100
};
jpgEncoder
.
Frames
.
Add
(
BitmapFrame
.
Create
(
frame
.
Path
.
SourceFrom
()));
jpgEncoder
.
Frames
.
Add
(
BitmapFrame
.
Create
(
frame
.
Path
.
SourceFrom
()));
...
...
ScreenToGif/Util/Other.cs
浏览文件 @
9b4989d9
...
@@ -415,11 +415,6 @@ namespace ScreenToGif.Util
...
@@ -415,11 +415,6 @@ namespace ScreenToGif.Util
var
item
=
list
[
oldIndex
];
var
item
=
list
[
oldIndex
];
list
.
RemoveAt
(
oldIndex
);
list
.
RemoveAt
(
oldIndex
);
//The actual index could have shifted due to the removal.
if
(
newIndex
>
oldIndex
)
newIndex
--;
list
.
Insert
(
newIndex
,
item
);
list
.
Insert
(
newIndex
,
item
);
return
list
;
return
list
;
...
...
ScreenToGif/Windows/Editor.xaml.cs
浏览文件 @
9b4989d9
...
@@ -1778,7 +1778,7 @@ namespace ScreenToGif.Windows
...
@@ -1778,7 +1778,7 @@ namespace ScreenToGif.Windows
}
}
//Since each frame has a number, upon reordering the numbers must be updated.
//Since each frame has a number, upon reordering the numbers must be updated.
AdjustFrameNumbers
(
selection
.
Select
(
s
=>
s
.
NextIndex
).
Min
());
AdjustFrameNumbers
(
selection
.
Select
(
s
=>
Math
.
Min
(
s
.
CurrentIndex
,
s
.
NextIndex
)
).
Min
());
FocusOnSelectedFrames
();
FocusOnSelectedFrames
();
ShowHint
(
"S.Hint.MoveLeft"
);
ShowHint
(
"S.Hint.MoveLeft"
);
...
@@ -1808,7 +1808,7 @@ namespace ScreenToGif.Windows
...
@@ -1808,7 +1808,7 @@ namespace ScreenToGif.Windows
}
}
//Since each frame has a number, upon reordering the numbers must be updated.
//Since each frame has a number, upon reordering the numbers must be updated.
AdjustFrameNumbers
(
selection
.
Select
(
s
=>
s
.
NextIndex
).
Min
());
AdjustFrameNumbers
(
selection
.
Select
(
s
=>
Math
.
Min
(
s
.
CurrentIndex
,
s
.
NextIndex
)
).
Min
());
FocusOnSelectedFrames
();
FocusOnSelectedFrames
();
ShowHint
(
"S.Hint.MoveRight"
);
ShowHint
(
"S.Hint.MoveRight"
);
...
@@ -4688,8 +4688,7 @@ namespace ScreenToGif.Windows
...
@@ -4688,8 +4688,7 @@ namespace ScreenToGif.Windows
if
(
closest
.
WorkingArea
.
Bottom
<
top
+
100
)
if
(
closest
.
WorkingArea
.
Bottom
<
top
+
100
)
top
=
closest
.
WorkingArea
.
Bottom
-
height
;
top
=
closest
.
WorkingArea
.
Bottom
-
height
;
if
(
top
>
int
.
MaxValue
||
top
<
int
.
MinValue
||
left
>
int
.
MaxValue
||
left
<
int
.
MinValue
||
if
(
top
>
int
.
MaxValue
||
top
<
int
.
MinValue
||
left
>
int
.
MaxValue
||
left
<
int
.
MinValue
||
width
>
int
.
MaxValue
||
width
<
0
||
height
>
int
.
MaxValue
||
height
<
0
)
width
>
int
.
MaxValue
||
width
<
int
.
MinValue
||
height
>
int
.
MaxValue
||
height
<
int
.
MinValue
)
{
{
var
desc
=
$"On load:
{
onLoad
}
\nScale:
{
this
.
Scale
()}
\n\n"
+
var
desc
=
$"On load:
{
onLoad
}
\nScale:
{
this
.
Scale
()}
\n\n"
+
$"Screen:
{
closest
.
AdapterName
}
\nBounds:
{
closest
.
Bounds
}
\n\nTopLeft:
{
top
}
x
{
left
}
\nWidthHeight:
{
width
}
x
{
height
}
\n\n"
+
$"Screen:
{
closest
.
AdapterName
}
\nBounds:
{
closest
.
Bounds
}
\n\nTopLeft:
{
top
}
x
{
left
}
\nWidthHeight:
{
width
}
x
{
height
}
\n\n"
+
...
...
ScreenToGif/Windows/Other/Startup.xaml.cs
浏览文件 @
9b4989d9
...
@@ -112,8 +112,7 @@ namespace ScreenToGif.Windows.Other
...
@@ -112,8 +112,7 @@ namespace ScreenToGif.Windows.Other
if
(
closest
.
WorkingArea
.
Bottom
<
top
+
100
)
if
(
closest
.
WorkingArea
.
Bottom
<
top
+
100
)
top
=
closest
.
WorkingArea
.
Bottom
-
height
;
top
=
closest
.
WorkingArea
.
Bottom
-
height
;
if
(
top
>
int
.
MaxValue
||
top
<
int
.
MinValue
||
left
>
int
.
MaxValue
||
left
<
int
.
MinValue
||
if
(
top
>
int
.
MaxValue
||
top
<
int
.
MinValue
||
left
>
int
.
MaxValue
||
left
<
int
.
MinValue
||
width
>
int
.
MaxValue
||
width
<
0
||
height
>
int
.
MaxValue
||
height
<
0
)
width
>
int
.
MaxValue
||
width
<
int
.
MinValue
||
height
>
int
.
MaxValue
||
height
<
int
.
MinValue
)
{
{
var
desc
=
$"On load:
{
onLoad
}
\nScale:
{
this
.
Scale
()}
\n\n"
+
var
desc
=
$"On load:
{
onLoad
}
\nScale:
{
this
.
Scale
()}
\n\n"
+
$"Screen:
{
closest
.
AdapterName
}
\nBounds:
{
closest
.
Bounds
}
\n\nTopLeft:
{
top
}
x
{
left
}
\nWidthHeight:
{
width
}
x
{
height
}
\n\n"
+
$"Screen:
{
closest
.
AdapterName
}
\nBounds:
{
closest
.
Bounds
}
\n\nTopLeft:
{
top
}
x
{
left
}
\nWidthHeight:
{
width
}
x
{
height
}
\n\n"
+
...
...
ScreenToGif/Windows/Recorder.xaml.cs
浏览文件 @
9b4989d9
...
@@ -1459,9 +1459,20 @@ namespace ScreenToGif.Windows
...
@@ -1459,9 +1459,20 @@ namespace ScreenToGif.Windows
var
regionLeft
=
(
int
)
Math
.
Round
((
Math
.
Round
(
Left
,
MidpointRounding
.
AwayFromZero
)
+
Constants
.
LeftOffset
)
*
_viewModel
.
CurrentMonitor
.
Scale
);
var
regionLeft
=
(
int
)
Math
.
Round
((
Math
.
Round
(
Left
,
MidpointRounding
.
AwayFromZero
)
+
Constants
.
LeftOffset
)
*
_viewModel
.
CurrentMonitor
.
Scale
);
var
regionTop
=
(
int
)
Math
.
Round
((
Math
.
Round
(
Top
,
MidpointRounding
.
AwayFromZero
)
+
Constants
.
TopOffset
)
*
_viewModel
.
CurrentMonitor
.
Scale
);
var
regionTop
=
(
int
)
Math
.
Round
((
Math
.
Round
(
Top
,
MidpointRounding
.
AwayFromZero
)
+
Constants
.
TopOffset
)
*
_viewModel
.
CurrentMonitor
.
Scale
);
var
regionWidth
=
(
int
)
Math
.
Round
((
UserSettings
.
All
.
RecorderWidth
-
Constants
.
HorizontalOffset
)
*
_viewModel
.
CurrentMonitor
.
Scale
);
var
regionWidth
=
(
int
)
Math
.
Round
((
UserSettings
.
All
.
RecorderWidth
-
Constants
.
HorizontalOffset
)
*
_viewModel
.
CurrentMonitor
.
Scale
);
var
regionHeight
=
(
int
)
Math
.
Round
((
UserSettings
.
All
.
RecorderHeight
-
Constants
.
VerticalOffset
)
*
_viewModel
.
CurrentMonitor
.
Scale
);
var
regionHeight
=
(
int
)
Math
.
Round
((
UserSettings
.
All
.
RecorderHeight
-
Constants
.
VerticalOffset
)
*
_viewModel
.
CurrentMonitor
.
Scale
);
if
(
regionWidth
<
0
||
regionHeight
<
0
)
{
var
desc
=
$"Scale:
{
this
.
Scale
()}
\n\nScreen:
{
closest
.
AdapterName
}
\nBounds:
{
closest
.
Bounds
}
\n\nTopLeft:
{
top
}
x
{
left
}
\nWidthHeight:
{
regionWidth
}
x
{
regionHeight
}
"
;
LogWriter
.
Log
(
"Wrong recorder window sizing"
,
desc
);
Height
=
UserSettings
.
All
.
RecorderHeight
=
500
;
Width
=
UserSettings
.
All
.
RecorderWidth
=
250
;
return
;
}
_viewModel
.
Region
=
new
Rect
(
regionLeft
,
regionTop
,
regionWidth
,
regionHeight
);
_viewModel
.
Region
=
new
Rect
(
regionLeft
,
regionTop
,
regionWidth
,
regionHeight
);
}
}
...
...
ScreenToGif/app.manifest
浏览文件 @
9b4989d9
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<assembly
manifestVersion=
"1.0"
xmlns=
"urn:schemas-microsoft-com:asm.v1"
>
<assembly
manifestVersion=
"1.0"
xmlns=
"urn:schemas-microsoft-com:asm.v1"
>
<assemblyIdentity
version=
"2.32.
0
.0"
name=
"ScreenToGif"
processorArchitecture=
"msil"
/>
<assemblyIdentity
version=
"2.32.
1
.0"
name=
"ScreenToGif"
processorArchitecture=
"msil"
/>
<trustInfo
xmlns=
"urn:schemas-microsoft-com:asm.v2"
>
<trustInfo
xmlns=
"urn:schemas-microsoft-com:asm.v2"
>
<security>
<security>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录