Auto merge of #27118 - atouchet:icon, r=jdm
Update Servo logo files <!-- Please describe your changes on the following line: --> Update of #25846. Add new Servo logo files and remove some old versions. Closes #25846 --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `___` with appropriate data: --> - [ ] `./mach build -d` does not report any errors - [ ] `./mach test-tidy` does not report any errors - [ ] These changes fix #___ (GitHub issue number if applicable) <!-- Either: --> - [ ] There are tests for these changes OR - [ ] These changes do not require tests because ___ <!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.--> <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->
|
@ -12,7 +12,7 @@ fn main() {
|
|||
#[cfg(windows)]
|
||||
{
|
||||
let mut res = winres::WindowsResource::new();
|
||||
res.set_icon("../../resources/Servo.ico");
|
||||
res.set_icon("../../resources/servo.ico");
|
||||
res.set_manifest_file("platform/windows/servo.exe.manifest");
|
||||
res.compile().unwrap();
|
||||
}
|
||||
|
|
|
@ -129,7 +129,7 @@ impl Window {
|
|||
|
||||
#[cfg(any(target_os = "linux", target_os = "windows"))]
|
||||
{
|
||||
let icon_bytes = include_bytes!("../../resources/servo64.png");
|
||||
let icon_bytes = include_bytes!("../../resources/servo_64.png");
|
||||
winit_window.set_window_icon(Some(load_icon(icon_bytes)));
|
||||
}
|
||||
|
||||
|
|
|
@ -739,7 +739,7 @@ class MachCommands(CommandBase):
|
|||
# like Instruments.app.
|
||||
try:
|
||||
import Cocoa
|
||||
icon_path = path.join(self.get_top_dir(), "resources", "servo.png")
|
||||
icon_path = path.join(self.get_top_dir(), "resources", "servo_1024.png")
|
||||
icon = Cocoa.NSImage.alloc().initWithContentsOfFile_(icon_path)
|
||||
if icon is not None:
|
||||
Cocoa.NSWorkspace.sharedWorkspace().setIcon_forFile_options_(icon,
|
||||
|
|
Before Width: | Height: | Size: 91 KiB After Width: | Height: | Size: 29 KiB |
Before Width: | Height: | Size: 1.9 KiB |
Before Width: | Height: | Size: 12 KiB |
Before Width: | Height: | Size: 6.1 KiB |
Before Width: | Height: | Size: 29 KiB After Width: | Height: | Size: 29 KiB |
Before Width: | Height: | Size: 565 KiB |
Before Width: | Height: | Size: 7.8 KiB |
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 13 KiB |
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |