[haiku-commits] haiku: hrev45866 - in src: apps/diskusage add-ons/kernel/busses/virtio
- From: stpere@xxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Wed, 17 Jul 2013 18:17:40 +0200 (CEST)
hrev45866 adds 2 changesets to branch 'master'
old head: e598dee7522bba2b525730cb6e888c5a69c8aead
new head: be064b5af3f60efe4e031e2a36f280a44bed65da
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=be064b5+%5Ee598dee
----------------------------------------------------------------------------
da1f251: DiskUsage: drawing artefact in TabView
be064b5: virtio_pci.cpp: check for (un)supported hardware never fit
CID #1032255
[ Philippe Saint-Pierre <stpere@xxxxxxxxx> ]
----------------------------------------------------------------------------
2 files changed, 2 insertions(+), 4 deletions(-)
src/add-ons/kernel/busses/virtio/virtio_pci.cpp | 3 +--
src/apps/diskusage/ControlsView.cpp | 3 +--
############################################################################
Commit: da1f251a8f0772b0e5055cf8f64043a5fad15704
URL: http://cgit.haiku-os.org/haiku/commit/?id=da1f251
Author: Philippe Saint-Pierre <stpere@xxxxxxxxx>
Date: Sat Jul 13 21:18:19 2013 UTC
DiskUsage: drawing artefact in TabView
----------------------------------------------------------------------------
diff --git a/src/apps/diskusage/ControlsView.cpp
b/src/apps/diskusage/ControlsView.cpp
index b5d222a..1b00450 100644
--- a/src/apps/diskusage/ControlsView.cpp
+++ b/src/apps/diskusage/ControlsView.cpp
@@ -73,13 +73,12 @@ VolumeTab::IconWidth() const
void
VolumeTab::DrawLabel(BView* owner, BRect frame)
{
+ owner->SetDrawingMode(B_OP_OVER);
if (fIcon != NULL) {
- owner->SetDrawingMode(B_OP_OVER);
owner->MovePenTo(frame.left + kSmallHMargin,
(frame.top + frame.bottom - fIcon->Bounds().Height()) /
2.0);
owner->DrawBitmap(fIcon);
}
- owner->SetDrawingMode(B_OP_COPY);
font_height fh;
owner->GetFontHeight(&fh);
############################################################################
Revision: hrev45866
Commit: be064b5af3f60efe4e031e2a36f280a44bed65da
URL: http://cgit.haiku-os.org/haiku/commit/?id=be064b5
Author: Philippe Saint-Pierre <stpere@xxxxxxxxx>
Date: Wed Jul 17 16:15:24 2013 UTC
Ticket: https://dev.haiku-os.org/ticket/1032255
virtio_pci.cpp: check for (un)supported hardware never fit
CID #1032255
----------------------------------------------------------------------------
diff --git a/src/add-ons/kernel/busses/virtio/virtio_pci.cpp
b/src/add-ons/kernel/busses/virtio/virtio_pci.cpp
index a9a7943..07dc775 100644
--- a/src/add-ons/kernel/busses/virtio/virtio_pci.cpp
+++ b/src/add-ons/kernel/busses/virtio/virtio_pci.cpp
@@ -583,9 +583,8 @@ supports_device(device_node* parent)
if (vendorID == VIRTIO_PCI_VENDORID) {
if (deviceID < VIRTIO_PCI_DEVICEID_MIN
- && deviceID > VIRTIO_PCI_DEVICEID_MAX) {
+ || deviceID > VIRTIO_PCI_DEVICEID_MAX)
return 0.0f;
- }
pci_device_module_info* pci;
pci_device* device;
Other related posts:
