Skip to content

Commit 2970c0a

Browse files
committed
dual monitor
Former-commit-id: 83e7fe6
1 parent 27f22f9 commit 2970c0a

12 files changed

Lines changed: 508 additions & 110 deletions

File tree

windows/APIExample/APIExample/APIExample.rc

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -151,15 +151,27 @@ IDD_DIALOG_SCREEN_SHARE DIALOGEX 0, 0, 632, 400
151151
STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_SYSMENU
152152
FONT 8, "MS Shell Dlg", 400, 0, 0x1
153153
BEGIN
154-
LTEXT "",IDC_STATIC_VIDEO,1,0,483,310,NOT WS_VISIBLE
155-
LISTBOX IDC_LIST_INFO_BROADCASTING,491,0,139,312,LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
156-
LTEXT "Channel Name",IDC_STATIC_CHANNELNAME,11,328,48,8
157-
EDITTEXT IDC_EDIT_CHANNELNAME,71,326,218,13,ES_AUTOHSCROLL
158-
PUSHBUTTON "JoinChannel",IDC_BUTTON_JOINCHANNEL,307,326,50,14
159-
LTEXT "Screen Capture",IDC_STATIC_SCREEN_CAPTURE,11,351,48,8
160-
PUSHBUTTON "Start Capture",IDC_BUTTON_START_CAPUTRE,307,352,50,14
161-
COMBOBOX IDC_COMBO_SCREEN_CAPTURE,71,353,218,30,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
162-
LTEXT "",IDC_STATIC_DETAIL,442,325,181,58
154+
LTEXT "",IDC_STATIC_VIDEO,1,0,481,312,NOT WS_VISIBLE
155+
LISTBOX IDC_LIST_INFO_BROADCASTING,491,0,139,308,LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
156+
LTEXT "Channel Name",IDC_STATIC_CHANNELNAME,11,319,48,8
157+
EDITTEXT IDC_EDIT_CHANNELNAME,71,317,182,13,ES_AUTOHSCROLL
158+
PUSHBUTTON "JoinChannel",IDC_BUTTON_JOINCHANNEL,265,317,50,14
159+
LTEXT "Window HWND",IDC_STATIC_SCREEN_CAPTURE,10,340,54,8
160+
PUSHBUTTON "Share Window",IDC_BUTTON_START_CAPUTRE,265,338,50,14
161+
COMBOBOX IDC_COMBO_SCREEN_CAPTURE,71,338,181,30,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
162+
LTEXT "",IDC_STATIC_DETAIL,487,321,136,62
163+
CONTROL "Share Cursor",IDC_CHECK_CURSOR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,325,346,58,10
164+
GROUPBOX "General Settings",IDC_STATIC_GENERAL,323,312,161,46
165+
LTEXT "FPS",IDC_STATIC_FPS,325,325,14,10
166+
EDITTEXT IDC_EDIT_FPS,342,325,55,12,ES_AUTOHSCROLL
167+
LTEXT "bitrate",IDC_STATIC_BITRATE,406,325,27,9
168+
EDITTEXT IDC_EDIT_BITRATE,433,322,46,14,ES_AUTOHSCROLL
169+
PUSHBUTTON "Update Calpture Param",IDC_BUTTON_UPDATEPARAM,391,342,89,14
170+
LTEXT "Screen",IDC_STATIC_SCREEN_SHARE,8,361,48,8
171+
COMBOBOX IDC_COMBO_SCREEN_SCREEN,69,359,181,30,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
172+
PUSHBUTTON "Share Screen",IDC_BUTTON_START_SHARE_SCREEN,264,357,50,14
173+
LTEXT "",IDC_STATIC_SCREEN_INFO,8,382,305,8
174+
LTEXT "",IDC_STATIC_SCREEN_INFO2,325,360,151,37
163175
END
164176

165177
IDD_DIALOG_CUSTOM_CAPTURE_VIDEO DIALOGEX 0, 0, 632, 400

windows/APIExample/APIExample/APIExample.vcxproj

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<ProjectGuid>{DB16CA2F-3910-4449-A5BD-6A602B33BE0F}</ProjectGuid>
2424
<Keyword>MFCProj</Keyword>
2525
<RootNamespace>APIExample</RootNamespace>
26-
<WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
26+
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
2727
</PropertyGroup>
2828
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
2929
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -76,6 +76,7 @@
7676
<PropertyGroup Label="UserMacros" />
7777
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
7878
<LinkIncremental>true</LinkIncremental>
79+
<GenerateManifest>true</GenerateManifest>
7980
</PropertyGroup>
8081
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
8182
<LinkIncremental>true</LinkIncremental>
@@ -114,6 +115,15 @@
114115
if exist zh-cn.ini (copy zh-cn.ini $(SolutionDir)$(Configuration))
115116
if exist en.ini (copy en.ini $(SolutionDir)$(Configuration))</Command>
116117
</PostBuildEvent>
118+
<Manifest>
119+
<AdditionalManifestFiles>
120+
</AdditionalManifestFiles>
121+
<OutputManifestFile>$(IntDir)$(TargetName)$(TargetExt).embed.manifest</OutputManifestFile>
122+
<EnableDpiAwareness>PerMonitorHighDPIAware</EnableDpiAwareness>
123+
</Manifest>
124+
<ManifestResourceCompile>
125+
<ResourceOutputFileName>$(IntDir)$(TargetName)$(TargetExt).embed.manifest.res</ResourceOutputFileName>
126+
</ManifestResourceCompile>
117127
</ItemDefinitionGroup>
118128
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
119129
<ClCompile>
@@ -144,6 +154,9 @@ if exist zh-cn.ini (copy zh-cn.ini $(SolutionDir)$(Platform)\$(Configuration))
144154
if exist en.ini (copy en.ini $(SolutionDir)$(Platform)\$(Configuration))
145155
</Command>
146156
</PostBuildEvent>
157+
<Manifest>
158+
<EnableDpiAwareness>PerMonitorHighDPIAware</EnableDpiAwareness>
159+
</Manifest>
147160
</ItemDefinitionGroup>
148161
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
149162
<ClCompile>
@@ -178,6 +191,13 @@ if exist zh-cn.ini (copy zh-cn.ini $(SolutionDir)$(Configuration))
178191
if exist en.ini (copy en.ini $(SolutionDir)$(Configuration))
179192
</Command>
180193
</PostBuildEvent>
194+
<ManifestResourceCompile>
195+
<ResourceOutputFileName>
196+
</ResourceOutputFileName>
197+
</ManifestResourceCompile>
198+
<Manifest>
199+
<EnableDpiAwareness>PerMonitorHighDPIAware</EnableDpiAwareness>
200+
</Manifest>
181201
</ItemDefinitionGroup>
182202
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
183203
<ClCompile>
@@ -212,6 +232,9 @@ if exist zh-cn.ini (copy zh-cn.ini $(SolutionDir)$(Platform)\$(Configuration))
212232
if exist en.ini (copy en.ini $(SolutionDir)$(Platform)\$(Configuration))
213233
</Command>
214234
</PostBuildEvent>
235+
<Manifest>
236+
<EnableDpiAwareness>PerMonitorHighDPIAware</EnableDpiAwareness>
237+
</Manifest>
215238
</ItemDefinitionGroup>
216239
<ItemGroup>
217240
<ClInclude Include="Advanced\AudioProfile\CAgoraAudioProfile.h" />

0 commit comments

Comments
 (0)